On Wed, 23 Sep 2026, Thomas Zimmermann <[email protected]> wrote: > DRM's fbdev helpers are for the fbdev-emulation clients. Move them > into the client-library module. Fix include statements throughout > DRM drivers.
FWIW, Acked-by: Jani Nikula <[email protected]> > > While at it, rename the files from drm_fb_helper to drm_fbdev_helper. > The old name was too reminiscent of DRM's framebuffer code. > > The GEM support code for fbdev remains part of DRM's memory managers. > > Signed-off-by: Thomas Zimmermann <[email protected]> > --- > drivers/gpu/drm/Makefile | 1 - > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- > drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 2 +- > drivers/gpu/drm/clients/Makefile | 3 ++- > drivers/gpu/drm/clients/drm_fbdev_client.c | 2 +- > .../gpu/drm/{drm_fb_helper.c => clients/drm_fbdev_helper.c} | 2 +- > drivers/gpu/drm/drm_fbdev_dma.c | 2 +- > drivers/gpu/drm/drm_fbdev_shmem.c | 2 +- > drivers/gpu/drm/drm_fbdev_ttm.c | 2 +- > drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- > drivers/gpu/drm/gma500/fbdev.c | 2 +- > drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- > drivers/gpu/drm/msm/msm_debugfs.c | 2 +- > drivers/gpu/drm/msm/msm_fbdev.c | 2 +- > drivers/gpu/drm/nouveau/dispnv50/disp.c | 1 - > drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +- > drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- > drivers/gpu/drm/radeon/radeon_device.c | 2 +- > drivers/gpu/drm/radeon/radeon_fbdev.c | 2 +- > drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- > drivers/gpu/drm/sitronix/st7571.c | 1 - > drivers/gpu/drm/tegra/fbdev.c | 2 +- > drivers/gpu/drm/vboxvideo/vbox_mode.c | 2 +- > include/drm/{drm_fb_helper.h => clients/drm_fbdev_helper.h} | 4 ++-- > 24 files changed, 23 insertions(+), 25 deletions(-) > rename drivers/gpu/drm/{drm_fb_helper.c => clients/drm_fbdev_helper.c} (99%) > rename include/drm/{drm_fb_helper.h => clients/drm_fbdev_helper.h} (99%) > > diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile > index f0c340aa2ec6..3a0f2095de3c 100644 > --- a/drivers/gpu/drm/Makefile > +++ b/drivers/gpu/drm/Makefile > @@ -158,7 +158,6 @@ drm_kms_helper-y := \ > drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o > drm_kms_helper-$(CONFIG_DRM_PANIC_HELPER) += drm_panic_helper.o > drm_kms_helper-$(CONFIG_DRM_PANIC_SCREEN_QR_CODE) += drm_panic_helper_qr.o > -drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o > obj-$(CONFIG_DRM_KMS_HELPER) += drm_kms_helper.o > > # > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 59ea338b554c..126bfd9bb89e 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -38,11 +38,11 @@ > > #include <linux/pci.h> > #include <linux/pm_runtime.h> > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_damage_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_edid.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_modeset_helper.h> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > index f2f179421c4d..51a7a4091376 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c > @@ -28,8 +28,8 @@ > > #include "amdgpu.h" > #include <drm/amdgpu_drm.h> > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include "amdgpu_uvd.h" > #include "amdgpu_vce.h" > #include "atom.h" > diff --git a/drivers/gpu/drm/clients/Makefile > b/drivers/gpu/drm/clients/Makefile > index c16addbc327f..1304ff358509 100644 > --- a/drivers/gpu/drm/clients/Makefile > +++ b/drivers/gpu/drm/clients/Makefile > @@ -4,5 +4,6 @@ subdir-ccflags-y += -I$(src)/.. > > drm_client_lib-y := drm_client_setup.o > drm_client_lib-$(CONFIG_DRM_CLIENT_LOG) += drm_log.o > -drm_client_lib-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_client.o > +drm_client_lib-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fbdev_client.o \ > + drm_fbdev_helper.o > obj-$(CONFIG_DRM_CLIENT_LIB) += drm_client_lib.o > diff --git a/drivers/gpu/drm/clients/drm_fbdev_client.c > b/drivers/gpu/drm/clients/drm_fbdev_client.c > index 7574bd36f45e..eec463d19943 100644 > --- a/drivers/gpu/drm/clients/drm_fbdev_client.c > +++ b/drivers/gpu/drm/clients/drm_fbdev_client.c > @@ -1,9 +1,9 @@ > // SPDX-License-Identifier: MIT > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_client.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_print.h> > > diff --git a/drivers/gpu/drm/drm_fb_helper.c > b/drivers/gpu/drm/clients/drm_fbdev_helper.c > similarity index 99% > rename from drivers/gpu/drm/drm_fb_helper.c > rename to drivers/gpu/drm/clients/drm_fbdev_helper.c > index 76195410db60..fff3cf6a0aed 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/clients/drm_fbdev_helper.c > @@ -32,9 +32,9 @@ > #include <linux/console.h> > #include <linux/export.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_atomic.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_framebuffer_helper.h> > diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c > index 9412d9fdd74b..452f84400350 100644 > --- a/drivers/gpu/drm/drm_fbdev_dma.c > +++ b/drivers/gpu/drm/drm_fbdev_dma.c > @@ -4,10 +4,10 @@ > #include <linux/fb.h> > #include <linux/vmalloc.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_fbdev_dma.h> > #include <drm/drm_fb_dma_helper.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_dma_helper.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/drm_fbdev_shmem.c > b/drivers/gpu/drm/drm_fbdev_shmem.c > index 458c899b5d4f..8eb05fe9bc98 100644 > --- a/drivers/gpu/drm/drm_fbdev_shmem.c > +++ b/drivers/gpu/drm/drm_fbdev_shmem.c > @@ -3,9 +3,9 @@ > #include <linux/export.h> > #include <linux/fb.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_fbdev_shmem.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_gem_shmem_helper.h> > diff --git a/drivers/gpu/drm/drm_fbdev_ttm.c b/drivers/gpu/drm/drm_fbdev_ttm.c > index 160bc35d8738..8eb59c2ac5ea 100644 > --- a/drivers/gpu/drm/drm_fbdev_ttm.c > +++ b/drivers/gpu/drm/drm_fbdev_ttm.c > @@ -4,9 +4,9 @@ > #include <linux/moduleparam.h> > #include <linux/vmalloc.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem.h> > #include <drm/drm_print.h> > diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > index 8641c9e84d4c..f412269d6323 100644 > --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c > @@ -10,9 +10,9 @@ > > #include <linux/fb.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_framebuffer_helper.h> > #include <drm/drm_prime.h> > diff --git a/drivers/gpu/drm/gma500/fbdev.c b/drivers/gpu/drm/gma500/fbdev.c > index d1e93588234f..428912574f20 100644 > --- a/drivers/gpu/drm/gma500/fbdev.c > +++ b/drivers/gpu/drm/gma500/fbdev.c > @@ -7,9 +7,9 @@ > > #include <linux/fb.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_framebuffer.h> > > #include "gem.h" > diff --git a/drivers/gpu/drm/i915/display/intel_fbdev.c > b/drivers/gpu/drm/i915/display/intel_fbdev.c > index db0e36dd8722..219ee17de3f6 100644 > --- a/drivers/gpu/drm/i915/display/intel_fbdev.c > +++ b/drivers/gpu/drm/i915/display/intel_fbdev.c > @@ -38,10 +38,10 @@ > #include <linux/vga_switcheroo.h> > > #include <drm/clients/drm_client_setup.h> > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/intel/display_parent_interface.h> > #include <drm/drm_crtc.h> > #include <drm/drm_crtc_helper.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_framebuffer_helper.h> > diff --git a/drivers/gpu/drm/msm/msm_debugfs.c > b/drivers/gpu/drm/msm/msm_debugfs.c > index f12701e286ec..d05307bfa123 100644 > --- a/drivers/gpu/drm/msm/msm_debugfs.c > +++ b/drivers/gpu/drm/msm/msm_debugfs.c > @@ -9,8 +9,8 @@ > #include <linux/debugfs.h> > #include <linux/fault-inject.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_debugfs.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_file.h> > #include <drm/drm_framebuffer.h> > > diff --git a/drivers/gpu/drm/msm/msm_fbdev.c b/drivers/gpu/drm/msm/msm_fbdev.c > index dd6d6c507d77..f37cc3f97a21 100644 > --- a/drivers/gpu/drm/msm/msm_fbdev.c > +++ b/drivers/gpu/drm/msm/msm_fbdev.c > @@ -6,9 +6,9 @@ > > #include <linux/fb.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_crtc_helper.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_file.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > diff --git a/drivers/gpu/drm/nouveau/dispnv50/disp.c > b/drivers/gpu/drm/nouveau/dispnv50/disp.c > index add19d479ebe..e91130f93db6 100644 > --- a/drivers/gpu/drm/nouveau/dispnv50/disp.c > +++ b/drivers/gpu/drm/nouveau/dispnv50/disp.c > @@ -40,7 +40,6 @@ > #include <drm/drm_atomic_helper.h> > #include <drm/drm_edid.h> > #include <drm/drm_eld.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fixed.h> > #include <drm/drm_probe_helper.h> > #include <drm/drm_vblank.h> > diff --git a/drivers/gpu/drm/omapdrm/omap_debugfs.c > b/drivers/gpu/drm/omapdrm/omap_debugfs.c > index 9edc1b3f9f95..1c40c489ed72 100644 > --- a/drivers/gpu/drm/omapdrm/omap_debugfs.c > +++ b/drivers/gpu/drm/omapdrm/omap_debugfs.c > @@ -6,10 +6,10 @@ > > #include <linux/seq_file.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_crtc.h> > #include <drm/drm_debugfs.h> > #include <drm/drm_file.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_print.h> > > diff --git a/drivers/gpu/drm/omapdrm/omap_fbdev.c > b/drivers/gpu/drm/omapdrm/omap_fbdev.c > index 4881777642d2..e1dcc3cb7c55 100644 > --- a/drivers/gpu/drm/omapdrm/omap_fbdev.c > +++ b/drivers/gpu/drm/omapdrm/omap_fbdev.c > @@ -7,9 +7,9 @@ > #include <linux/fb.h> > > #include <drm/clients/drm_client_setup.h> > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_crtc_helper.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_file.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > diff --git a/drivers/gpu/drm/radeon/radeon_device.c > b/drivers/gpu/drm/radeon/radeon_device.c > index 9523240110a6..fdbdcefa84e7 100644 > --- a/drivers/gpu/drm/radeon/radeon_device.c > +++ b/drivers/gpu/drm/radeon/radeon_device.c > @@ -33,11 +33,11 @@ > #include <linux/vga_switcheroo.h> > #include <linux/vgaarb.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_cache.h> > #include <drm/drm_client_event.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_device.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_file.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_probe_helper.h> > diff --git a/drivers/gpu/drm/radeon/radeon_fbdev.c > b/drivers/gpu/drm/radeon/radeon_fbdev.c > index 3e243f5e2f44..e40c23d9dff2 100644 > --- a/drivers/gpu/drm/radeon/radeon_fbdev.c > +++ b/drivers/gpu/drm/radeon/radeon_fbdev.c > @@ -29,9 +29,9 @@ > #include <linux/pm_runtime.h> > #include <linux/vga_switcheroo.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_crtc_helper.h> > #include <drm/drm_drv.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_framebuffer_helper.h> > diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > index 9a1dc9f12072..b55113a7a00b 100644 > --- a/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > +++ b/drivers/gpu/drm/rockchip/rockchip_drm_gem.c > @@ -8,9 +8,9 @@ > #include <linux/iommu.h> > #include <linux/vmalloc.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm.h> > #include <drm/drm_dumb_buffers.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_gem.h> > #include <drm/drm_gem_dma_helper.h> > #include <drm/drm_prime.h> > diff --git a/drivers/gpu/drm/sitronix/st7571.c > b/drivers/gpu/drm/sitronix/st7571.c > index fc3ba5e8600f..5e60c4685671 100644 > --- a/drivers/gpu/drm/sitronix/st7571.c > +++ b/drivers/gpu/drm/sitronix/st7571.c > @@ -20,7 +20,6 @@ > #include <drm/drm_damage_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_encoder.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fbdev_shmem.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > diff --git a/drivers/gpu/drm/tegra/fbdev.c b/drivers/gpu/drm/tegra/fbdev.c > index 003e80cf7b9a..64c2e64f219b 100644 > --- a/drivers/gpu/drm/tegra/fbdev.c > +++ b/drivers/gpu/drm/tegra/fbdev.c > @@ -11,9 +11,9 @@ > #include <linux/fb.h> > #include <linux/vmalloc.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_drv.h> > #include <drm/drm_crtc_helper.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_framebuffer_helper.h> > diff --git a/drivers/gpu/drm/vboxvideo/vbox_mode.c > b/drivers/gpu/drm/vboxvideo/vbox_mode.c > index bb3f7f0ad7c4..7c34299fa531 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_mode.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_mode.c > @@ -13,11 +13,11 @@ > #include <linux/iosys-map.h> > #include <linux/export.h> > > +#include <drm/clients/drm_fbdev_helper.h> > #include <drm/drm_atomic.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_blend.h> > #include <drm/drm_edid.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_framebuffer.h> > #include <drm/drm_gem_atomic_helper.h> > diff --git a/include/drm/drm_fb_helper.h > b/include/drm/clients/drm_fbdev_helper.h > similarity index 99% > rename from include/drm/drm_fb_helper.h > rename to include/drm/clients/drm_fbdev_helper.h > index 0c5e5ed7b5e7..7575aaf34c62 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/clients/drm_fbdev_helper.h > @@ -27,8 +27,8 @@ > * Dave Airlie <[email protected]> > * Jesse Barnes <[email protected]> > */ > -#ifndef DRM_FB_HELPER_H > -#define DRM_FB_HELPER_H > +#ifndef DRM_FBDEV_HELPER_H > +#define DRM_FBDEV_HELPER_H > > struct drm_clip_rect; > struct drm_fb_helper; -- Jani Nikula, Intel
