drm: Move sysfb drivers into separate subdirectory

The ofdrm and simpledrm drivers are special as they operate on
externally provided framebuffers. Move them into their own sub-
directory. Will let them share common code.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://lore.kernel.org/r/20250401094056.32904-5-tzimmermann@suse.de

diff --git a/MAINTAINERS b/MAINTAINERS
index 048dcf2a3675079a2d0bf16f75bf8e107c866046..2773c1a8c2634840196dd43b7ae77f77441c275f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -7237,8 +7237,7 @@ M:        Javier Martinez Canillas <javierm@redhat.com>
 L:     dri-devel@lists.freedesktop.org
 S:     Maintained
 T:     git https://gitlab.freedesktop.org/drm/misc/kernel.git
-F:     drivers/gpu/drm/tiny/ofdrm.c
-F:     drivers/gpu/drm/tiny/simpledrm.c
+F:     drivers/gpu/drm/sysfb/
 F:     drivers/video/aperture.c
 F:     drivers/video/nomodeset.c
 F:     include/linux/aperture.h

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 1c6fa662d6ed594ed793a8ac10dd9827d8ea6b5c..46730666d435ec38f593a92d6e06e134481caef9 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -255,6 +255,8 @@ config DRM_SCHED
        tristate
        depends on DRM
 
+source "drivers/gpu/drm/sysfb/Kconfig"
+
 source "drivers/gpu/drm/arm/Kconfig"
 
 source "drivers/gpu/drm/radeon/Kconfig"

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 5a332f7d3ecccb6e5e1fb9fb811eab7aa5a84a21..09fb73cca6de07ab81f4c4dcefc1ae554caff115 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -204,6 +204,7 @@ obj-$(CONFIG_DRM_FSL_DCU) += fsl-dcu/
 obj-$(CONFIG_DRM_ETNAVIV) += etnaviv/
 obj-y                  += hisilicon/
 obj-y                  += mxsfb/
+obj-y                  += sysfb/
 obj-y                  += tiny/
 obj-$(CONFIG_DRM_PL111) += pl111/
 obj-$(CONFIG_DRM_TVE200) += tve200/

diff --git a/drivers/gpu/drm/sysfb/Kconfig b/drivers/gpu/drm/sysfb/Kconfig
new file mode 100644 (file)
index 0000000..9eafc06
--- /dev/null
+++ b/drivers/gpu/drm/sysfb/Kconfig
@@ -0,0 +1,38 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+menu "Drivers for system framebuffers"
+       depends on DRM
+
+config DRM_OFDRM
+       tristate "Open Firmware display driver"
+       depends on DRM && MMU && OF && (PPC || COMPILE_TEST)
+       select APERTURE_HELPERS
+       select DRM_CLIENT_SELECTION
+       select DRM_GEM_SHMEM_HELPER
+       select DRM_KMS_HELPER
+       help
+         DRM driver for Open Firmware framebuffers.
+
+         This driver assumes that the display hardware has been initialized
+         by the Open Firmware before the kernel boots. Scanout buffer, size,
+         and display format must be provided via device tree.
+
+config DRM_SIMPLEDRM
+       tristate "Simple framebuffer driver"
+       depends on DRM && MMU
+       select APERTURE_HELPERS
+       select DRM_CLIENT_SELECTION
+       select DRM_GEM_SHMEM_HELPER
+       select DRM_KMS_HELPER
+       help
+         DRM driver for simple platform-provided framebuffers.
+
+         This driver assumes that the display hardware has been initialized
+         by the firmware or bootloader before the kernel boots. Scanout
+         buffer, size, and display format must be provided via device tree,
+         UEFI, VESA, etc.
+
+         On x86 BIOS or UEFI systems, you should also select SYSFB_SIMPLEFB
+         to use UEFI and VESA framebuffers.
+
+endmenu

diff --git a/drivers/gpu/drm/sysfb/Makefile b/drivers/gpu/drm/sysfb/Makefile
new file mode 100644 (file)
index 0000000..f6c0362
--- /dev/null
+++ b/drivers/gpu/drm/sysfb/Makefile
@@ -0,0 +1,4 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+obj-$(CONFIG_DRM_OFDRM)                += ofdrm.o
+obj-$(CONFIG_DRM_SIMPLEDRM)    += simpledrm.o

diff --git a/drivers/gpu/drm/tiny/ofdrm.c b/drivers/gpu/drm/sysfb/ofdrm.c
similarity index 100%
rename from drivers/gpu/drm/tiny/ofdrm.c
rename to drivers/gpu/drm/sysfb/ofdrm.c

diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/sysfb/simpledrm.c
similarity index 100%
rename from drivers/gpu/drm/tiny/simpledrm.c
rename to drivers/gpu/drm/sysfb/simpledrm.c

diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index 54c84c9801c19282bec90f06d7a77951732ffca5..95c1457d773099b4460e4adb872ed8bc64f1f282 100644 (file)
--- a/drivers/gpu/drm/tiny/Kconfig
+++ b/drivers/gpu/drm/tiny/Kconfig
@@ -65,20 +65,6 @@ config DRM_GM12U320
         This is a KMS driver for projectors which use the GM12U320 chipset
         for video transfer over USB2/3, such as the Acer C120 mini projector.
 
-config DRM_OFDRM
-       tristate "Open Firmware display driver"
-       depends on DRM && MMU && OF && (PPC || COMPILE_TEST)
-       select APERTURE_HELPERS
-       select DRM_CLIENT_SELECTION
-       select DRM_GEM_SHMEM_HELPER
-       select DRM_KMS_HELPER
-       help
-         DRM driver for Open Firmware framebuffers.
-
-         This driver assumes that the display hardware has been initialized
-         by the Open Firmware before the kernel boots. Scanout buffer, size,
-         and display format must be provided via device tree.
-
 config DRM_PANEL_MIPI_DBI
        tristate "DRM support for MIPI DBI compatible panels"
        depends on DRM && SPI
@@ -95,24 +81,6 @@ config DRM_PANEL_MIPI_DBI
          https://github.com/notro/panel-mipi-dbi/wiki.
          To compile this driver as a module, choose M here.
 
-config DRM_SIMPLEDRM
-       tristate "Simple framebuffer driver"
-       depends on DRM && MMU
-       select APERTURE_HELPERS
-       select DRM_CLIENT_SELECTION
-       select DRM_GEM_SHMEM_HELPER
-       select DRM_KMS_HELPER
-       help
-         DRM driver for simple platform-provided framebuffers.
-
-         This driver assumes that the display hardware has been initialized
-         by the firmware or bootloader before the kernel boots. Scanout
-         buffer, size, and display format must be provided via device tree,
-         UEFI, VESA, etc.
-
-         On x86 BIOS or UEFI systems, you should also select SYSFB_SIMPLEFB
-         to use UEFI and VESA framebuffers.
-
 config TINYDRM_HX8357D
        tristate "DRM support for HX8357D display panels"
        depends on DRM && SPI

diff --git a/drivers/gpu/drm/tiny/Makefile b/drivers/gpu/drm/tiny/Makefile
index 0a3a7837a58b2a611e598ecd6101f8f40a0924fd..ba4a60bb72bdfb24c910e4992cab5047d4f9136d 100644 (file)
--- a/drivers/gpu/drm/tiny/Makefile
+++ b/drivers/gpu/drm/tiny/Makefile
@@ -5,9 +5,7 @@ obj-$(CONFIG_DRM_ARCPGU)                += arcpgu.o
 obj-$(CONFIG_DRM_BOCHS)                        += bochs.o
 obj-$(CONFIG_DRM_CIRRUS_QEMU)          += cirrus-qemu.o
 obj-$(CONFIG_DRM_GM12U320)             += gm12u320.o
-obj-$(CONFIG_DRM_OFDRM)                        += ofdrm.o
 obj-$(CONFIG_DRM_PANEL_MIPI_DBI)       += panel-mipi-dbi.o
-obj-$(CONFIG_DRM_SIMPLEDRM)            += simpledrm.o
 obj-$(CONFIG_TINYDRM_HX8357D)          += hx8357d.o
 obj-$(CONFIG_TINYDRM_ILI9163)          += ili9163.o
 obj-$(CONFIG_TINYDRM_ILI9225)          += ili9225.o