| .. | .. |
|---|
| 1 | +// SPDX-License-Identifier: GPL-2.0-or-later |
|---|
| 1 | 2 | /* |
|---|
| 2 | 3 | * Copyright (C) 2015 Free Electrons |
|---|
| 3 | 4 | * Copyright (C) 2015 NextThing Co |
|---|
| 4 | 5 | * |
|---|
| 5 | 6 | * Maxime Ripard <maxime.ripard@free-electrons.com> |
|---|
| 6 | | - * |
|---|
| 7 | | - * This program is free software; you can redistribute it and/or |
|---|
| 8 | | - * modify it under the terms of the GNU General Public License as |
|---|
| 9 | | - * published by the Free Software Foundation; either version 2 of |
|---|
| 10 | | - * the License, or (at your option) any later version. |
|---|
| 11 | 7 | */ |
|---|
| 12 | 8 | |
|---|
| 13 | 9 | #include <drm/drm_atomic.h> |
|---|
| 14 | 10 | #include <drm/drm_atomic_helper.h> |
|---|
| 15 | | -#include <drm/drm_fb_helper.h> |
|---|
| 16 | | -#include <drm/drm_fb_cma_helper.h> |
|---|
| 17 | 11 | #include <drm/drm_gem_framebuffer_helper.h> |
|---|
| 18 | | -#include <drm/drmP.h> |
|---|
| 19 | 12 | |
|---|
| 20 | 13 | #include "sun4i_drv.h" |
|---|
| 21 | 14 | #include "sun4i_framebuffer.h" |
|---|
| .. | .. |
|---|
| 37 | 30 | } |
|---|
| 38 | 31 | |
|---|
| 39 | 32 | static const struct drm_mode_config_funcs sun4i_de_mode_config_funcs = { |
|---|
| 40 | | - .output_poll_changed = drm_fb_helper_output_poll_changed, |
|---|
| 41 | 33 | .atomic_check = sun4i_de_atomic_check, |
|---|
| 42 | 34 | .atomic_commit = drm_atomic_helper_commit, |
|---|
| 43 | 35 | .fb_create = drm_gem_fb_create, |
|---|
| 44 | 36 | }; |
|---|
| 45 | 37 | |
|---|
| 46 | | -static struct drm_mode_config_helper_funcs sun4i_de_mode_config_helpers = { |
|---|
| 38 | +static const struct drm_mode_config_helper_funcs sun4i_de_mode_config_helpers = { |
|---|
| 47 | 39 | .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, |
|---|
| 48 | 40 | }; |
|---|
| 49 | 41 | |
|---|
| 50 | | -int sun4i_framebuffer_init(struct drm_device *drm) |
|---|
| 42 | +void sun4i_framebuffer_init(struct drm_device *drm) |
|---|
| 51 | 43 | { |
|---|
| 52 | 44 | drm_mode_config_reset(drm); |
|---|
| 53 | 45 | |
|---|
| .. | .. |
|---|
| 56 | 48 | |
|---|
| 57 | 49 | drm->mode_config.funcs = &sun4i_de_mode_config_funcs; |
|---|
| 58 | 50 | drm->mode_config.helper_private = &sun4i_de_mode_config_helpers; |
|---|
| 59 | | - |
|---|
| 60 | | - return drm_fb_cma_fbdev_init(drm, 32, 0); |
|---|
| 61 | | -} |
|---|
| 62 | | - |
|---|
| 63 | | -void sun4i_framebuffer_free(struct drm_device *drm) |
|---|
| 64 | | -{ |
|---|
| 65 | | - drm_fb_cma_fbdev_fini(drm); |
|---|
| 66 | 51 | } |
|---|