Skip to content

Commit 8ab59da

Browse files
committed
drm/fb-helper: Move generic fbdev emulation into separate source file
Move the generic fbdev implementation into its own source and header file. Adapt drivers. No functional changes, but some of the internal helpers have been renamed to fit into the drm_fbdev_ naming scheme. v3: * rename drm_fbdev.{c,h} to drm_fbdev_generic.{c,h} * rebase onto vmwgfx changes * rebase onto xlnx changes * fix include statements in amdgpu Signed-off-by: Thomas Zimmermann <[email protected]> Reviewed-by: Javier Martinez Canillas <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent e7c5c29 commit 8ab59da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+571
-558
lines changed

drivers/gpu/drm/Makefile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,9 @@ drm_kms_helper-y := \
117117
drm_self_refresh_helper.o \
118118
drm_simple_kms_helper.o
119119
drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
120-
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
120+
drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += \
121+
drm_fbdev_generic.o \
122+
drm_fb_helper.o
121123
obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o
122124

123125
#

drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include <drm/amdgpu_drm.h>
2626
#include <drm/drm_aperture.h>
2727
#include <drm/drm_drv.h>
28+
#include <drm/drm_fbdev_generic.h>
2829
#include <drm/drm_gem.h>
2930
#include <drm/drm_vblank.h>
3031
#include <drm/drm_managed.h>

drivers/gpu/drm/arm/display/komeda/komeda_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <linux/platform_device.h>
1010
#include <linux/component.h>
1111
#include <linux/pm_runtime.h>
12-
#include <drm/drm_fb_helper.h>
12+
#include <drm/drm_fbdev_generic.h>
1313
#include <drm/drm_module.h>
1414
#include <drm/drm_of.h>
1515
#include "komeda_dev.h"

drivers/gpu/drm/arm/hdlcd_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <drm/drm_crtc.h>
2727
#include <drm/drm_debugfs.h>
2828
#include <drm/drm_drv.h>
29-
#include <drm/drm_fb_helper.h>
29+
#include <drm/drm_fbdev_generic.h>
3030
#include <drm/drm_gem_dma_helper.h>
3131
#include <drm/drm_gem_framebuffer_helper.h>
3232
#include <drm/drm_modeset_helper.h>

drivers/gpu/drm/arm/malidp_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <drm/drm_atomic_helper.h>
2020
#include <drm/drm_crtc.h>
2121
#include <drm/drm_drv.h>
22-
#include <drm/drm_fb_helper.h>
22+
#include <drm/drm_fbdev_generic.h>
2323
#include <drm/drm_fourcc.h>
2424
#include <drm/drm_gem_dma_helper.h>
2525
#include <drm/drm_gem_framebuffer_helper.h>

drivers/gpu/drm/aspeed/aspeed_gfx_drv.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
#include <drm/drm_atomic_helper.h>
1717
#include <drm/drm_crtc_helper.h>
1818
#include <drm/drm_device.h>
19-
#include <drm/drm_fb_helper.h>
19+
#include <drm/drm_fbdev_generic.h>
2020
#include <drm/drm_gem_dma_helper.h>
2121
#include <drm/drm_gem_framebuffer_helper.h>
2222
#include <drm/drm_module.h>

drivers/gpu/drm/ast/ast_drv.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
#include <drm/drm_atomic_helper.h>
3434
#include <drm/drm_crtc_helper.h>
3535
#include <drm/drm_drv.h>
36+
#include <drm/drm_fbdev_generic.h>
3637
#include <drm/drm_gem_shmem_helper.h>
3738
#include <drm/drm_module.h>
3839
#include <drm/drm_probe_helper.h>

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
#include <drm/drm_atomic.h>
2020
#include <drm/drm_atomic_helper.h>
2121
#include <drm/drm_drv.h>
22-
#include <drm/drm_fb_helper.h>
22+
#include <drm/drm_fbdev_generic.h>
2323
#include <drm/drm_gem_dma_helper.h>
2424
#include <drm/drm_gem_framebuffer_helper.h>
2525
#include <drm/drm_module.h>

0 commit comments

Comments
 (0)