diff options
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-10 12:52:34 -0400 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-08-12 04:41:18 -0400 |
| commit | 44adece57e2604cec8527a499b48e4d584ab53b8 (patch) | |
| tree | d8d9bb2e27c2a8b4da7575ed540b067ca014c62c /drivers/gpu/drm/sun4i | |
| parent | e24165537312723e2900831dd6e7415b8d85278c (diff) | |
drm/fb-helper: Add a dummy remove_conflicting_framebuffers
Lots of drivers don't properly compile without this when CONFIG_FB=n.
It's kinda a hack, but since CONFIG_FB doesn't stub any fucntions when
it's disabled I think it makes sense to add it to drm_fb_helper.h.
Long term we probably need to rethink all the logic to unload firmware
framebuffer drivers, at least if we want to be able to move away from
CONFIG_FB and fbcon.
v2: Unfortunately just stubbing out remove_conflicting_framebuffers in
drm_fb_helper.h upset gcc about static vs. non-static declarations, so
a new wrapper it needs to be. Means more churn :(
Cc: Tobias Jakobi <tjakobi@math.uni-bielefeld.de>
Cc: Noralf Trønnes <noralf@tronnes.org>
Cc: tomi.valkeinen@ti.com
Cc: dh.herrmann@gmail.com
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1470847958-28465-2-git-send-email-daniel.vetter@ffwll.ch
Diffstat (limited to 'drivers/gpu/drm/sun4i')
| -rw-r--r-- | drivers/gpu/drm/sun4i/sun4i_drv.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 7092daaf6c43..8913c151b37f 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c | |||
| @@ -17,6 +17,7 @@ | |||
| 17 | #include <drm/drm_crtc_helper.h> | 17 | #include <drm/drm_crtc_helper.h> |
| 18 | #include <drm/drm_fb_cma_helper.h> | 18 | #include <drm/drm_fb_cma_helper.h> |
| 19 | #include <drm/drm_gem_cma_helper.h> | 19 | #include <drm/drm_gem_cma_helper.h> |
| 20 | #include <drm/drm_fb_helper.h> | ||
| 20 | 21 | ||
| 21 | #include "sun4i_crtc.h" | 22 | #include "sun4i_crtc.h" |
| 22 | #include "sun4i_drv.h" | 23 | #include "sun4i_drv.h" |
| @@ -109,7 +110,7 @@ static void sun4i_remove_framebuffers(void) | |||
| 109 | ap->ranges[0].base = 0; | 110 | ap->ranges[0].base = 0; |
| 110 | ap->ranges[0].size = ~0; | 111 | ap->ranges[0].size = ~0; |
| 111 | 112 | ||
| 112 | remove_conflicting_framebuffers(ap, "sun4i-drm-fb", false); | 113 | drm_fb_helper_remove_conflicting_framebuffers(ap, "sun4i-drm-fb", false); |
| 113 | kfree(ap); | 114 | kfree(ap); |
| 114 | } | 115 | } |
| 115 | 116 | ||
