Move drm_format_helper.o from drm_kms_helper.ko to drm_pixel_helper.ko. Select DRM_PIXEL_HELPER from the drivers that use the format helpers. While at it, include <drm/drm_format_helper.h> in a few places where it is missing.
Format helpers copy pixel data from a DRM framebuffer to a hardware scanout buffer or some other destination. They can transform the color format as part of the copying operation. A number of drivers require this functionality as part of their display update. The format helpers are currently part of drm_kms_helper.ko, which is for mode-setting helpers (i.e, helpers that modify the display pipeline). Signed-off-by: Thomas Zimmermann <[email protected]> --- drivers/gpu/drm/Kconfig | 1 + drivers/gpu/drm/Kconfig.debug | 1 + drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/ast/Kconfig | 1 + drivers/gpu/drm/gud/Kconfig | 1 + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 1 + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 1 + drivers/gpu/drm/hyperv/Kconfig | 1 + drivers/gpu/drm/mgag200/Kconfig | 1 + drivers/gpu/drm/sitronix/Kconfig | 2 ++ drivers/gpu/drm/solomon/Kconfig | 1 + drivers/gpu/drm/sysfb/Kconfig | 1 + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 1 + drivers/gpu/drm/tiny/Kconfig | 6 ++++++ drivers/gpu/drm/tiny/bochs.c | 1 + 15 files changed, 21 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig index dce5e25671ee..8e4a588e9111 100644 --- a/drivers/gpu/drm/Kconfig +++ b/drivers/gpu/drm/Kconfig @@ -37,6 +37,7 @@ config DRM_MIPI_DBI tristate depends on DRM select DRM_KMS_HELPER + select DRM_PIXEL_HELPER config DRM_MIPI_DSI bool diff --git a/drivers/gpu/drm/Kconfig.debug b/drivers/gpu/drm/Kconfig.debug index b909cd0a619f..1afb9cad850f 100644 --- a/drivers/gpu/drm/Kconfig.debug +++ b/drivers/gpu/drm/Kconfig.debug @@ -70,6 +70,7 @@ config DRM_KUNIT_TEST select DRM_GEM_SHMEM_HELPER select DRM_KUNIT_TEST_HELPERS select DRM_PANIC_HELPER + select DRM_PIXEL_HELPER select DRM_SYSFB_HELPER select PRIME_NUMBERS default KUNIT_ALL_TESTS diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile index 5f555a2c1a4c..fbc643747110 100644 --- a/drivers/gpu/drm/Makefile +++ b/drivers/gpu/drm/Makefile @@ -100,6 +100,7 @@ obj-$(CONFIG_DRM_PANEL_ORIENTATION_QUIRKS) += drm_panel_orientation_quirks.o obj-$(CONFIG_DRM_PANEL_BACKLIGHT_QUIRKS) += drm_panel_backlight_quirks.o drm_pixel_helper-y := \ + drm_format_helper.o \ drm_pixel_helper_common.o obj-$(CONFIG_DRM_PIXEL_HELPER) += drm_pixel_helper.o @@ -150,7 +151,6 @@ drm_kms_helper-y := \ drm_crtc_helper.o \ drm_damage_helper.o \ drm_flip_work.o \ - drm_format_helper.o \ drm_gem_atomic_helper.o \ drm_gem_framebuffer_helper.o \ drm_kms_helper_common.o \ diff --git a/drivers/gpu/drm/ast/Kconfig b/drivers/gpu/drm/ast/Kconfig index 242fbccdf844..1758debb8317 100644 --- a/drivers/gpu/drm/ast/Kconfig +++ b/drivers/gpu/drm/ast/Kconfig @@ -5,6 +5,7 @@ config DRM_AST select DRM_CLIENT_SELECTION select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER select I2C select I2C_ALGOBIT help diff --git a/drivers/gpu/drm/gud/Kconfig b/drivers/gpu/drm/gud/Kconfig index b4d2136942f0..385702103633 100644 --- a/drivers/gpu/drm/gud/Kconfig +++ b/drivers/gpu/drm/gud/Kconfig @@ -7,6 +7,7 @@ config DRM_GUD select DRM_CLIENT_SELECTION select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER + select DRM_PIXEL_HELPER select BACKLIGHT_CLASS_DEVICE help This is a DRM display driver for GUD USB Displays or display diff --git a/drivers/gpu/drm/hisilicon/hibmc/Kconfig b/drivers/gpu/drm/hisilicon/hibmc/Kconfig index adf4516bf8f6..f896f8cb8689 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/Kconfig +++ b/drivers/gpu/drm/hisilicon/hibmc/Kconfig @@ -7,6 +7,7 @@ config DRM_HISI_HIBMC select DRM_DISPLAY_DP_HELPER select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER select I2C select I2C_ALGOBIT help diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index 7849abd0488e..aaef70153f7e 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -17,6 +17,7 @@ #include <drm/drm_atomic_helper.h> #include <drm/drm_damage_helper.h> #include <drm/drm_fourcc.h> +#include <drm/drm_format_helper.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_vblank.h> diff --git a/drivers/gpu/drm/hyperv/Kconfig b/drivers/gpu/drm/hyperv/Kconfig index 86234f6a73f2..21146ed294e3 100644 --- a/drivers/gpu/drm/hyperv/Kconfig +++ b/drivers/gpu/drm/hyperv/Kconfig @@ -5,6 +5,7 @@ config DRM_HYPERV select DRM_CLIENT_SELECTION select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER + select DRM_PIXEL_HELPER help This is a KMS driver for Hyper-V synthetic video device. Choose this option if you would like to enable drm driver for Hyper-V virtual diff --git a/drivers/gpu/drm/mgag200/Kconfig b/drivers/gpu/drm/mgag200/Kconfig index a962ae564a75..06bb23a888f9 100644 --- a/drivers/gpu/drm/mgag200/Kconfig +++ b/drivers/gpu/drm/mgag200/Kconfig @@ -5,6 +5,7 @@ config DRM_MGAG200 select DRM_CLIENT_SELECTION select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER select I2C select I2C_ALGOBIT help diff --git a/drivers/gpu/drm/sitronix/Kconfig b/drivers/gpu/drm/sitronix/Kconfig index 41a428ef8295..c4b54f4f4f69 100644 --- a/drivers/gpu/drm/sitronix/Kconfig +++ b/drivers/gpu/drm/sitronix/Kconfig @@ -4,6 +4,7 @@ config DRM_ST7571 select DRM_CLIENT_SELECTION select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER select VIDEOMODE_HELPERS help Sitronix ST7571 is a driver and controller for 4-level gray @@ -46,6 +47,7 @@ config DRM_ST7586 select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER select DRM_MIPI_DBI + select DRM_PIXEL_HELPER help DRM driver for the following Sitronix ST7586 panels: * LEGO MINDSTORMS EV3 diff --git a/drivers/gpu/drm/solomon/Kconfig b/drivers/gpu/drm/solomon/Kconfig index 400a6cab3a67..b65daabb2e96 100644 --- a/drivers/gpu/drm/solomon/Kconfig +++ b/drivers/gpu/drm/solomon/Kconfig @@ -5,6 +5,7 @@ config DRM_SSD130X select DRM_CLIENT_SELECTION select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER help DRM driver for the SSD13xx Solomon and SINO WEALTH SH110x OLED controllers. This is only for the core driver, a driver for the diff --git a/drivers/gpu/drm/sysfb/Kconfig b/drivers/gpu/drm/sysfb/Kconfig index f7e48178885e..eaf6b8d1cd51 100644 --- a/drivers/gpu/drm/sysfb/Kconfig +++ b/drivers/gpu/drm/sysfb/Kconfig @@ -5,6 +5,7 @@ menu "Drivers for system framebuffers" config DRM_SYSFB_HELPER tristate + select DRM_PIXEL_HELPER depends on DRM config DRM_COREBOOTDRM diff --git a/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c b/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c index 13df0925163a..c403c168c4c3 100644 --- a/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c +++ b/drivers/gpu/drm/sysfb/drm_sysfb_modeset.c @@ -10,6 +10,7 @@ #include <drm/drm_drv.h> #include <drm/drm_edid.h> #include <drm/drm_fourcc.h> +#include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_framebuffer_helper.h> #include <drm/drm_panic.h> diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig index f0e72d4b6a47..176d75ce17ea 100644 --- a/drivers/gpu/drm/tiny/Kconfig +++ b/drivers/gpu/drm/tiny/Kconfig @@ -6,6 +6,7 @@ config DRM_APPLETBDRM depends on X86 || COMPILE_TEST select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER help Say Y here if you want support for the display of Touch Bars on x86 MacBook Pros. @@ -30,6 +31,7 @@ config DRM_BOCHS select DRM_CLIENT_SELECTION select DRM_GEM_SHMEM_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER help This is a KMS driver for qemu's stdvga output. Choose this option for qemu. @@ -42,6 +44,7 @@ config DRM_CIRRUS_QEMU select DRM_CLIENT_SELECTION select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER + select DRM_PIXEL_HELPER help This is a KMS driver for emulated cirrus device in qemu. It is *NOT* intended for real cirrus devices. This requires @@ -62,6 +65,7 @@ config DRM_GM12U320 select DRM_CLIENT_SELECTION select DRM_KMS_HELPER select DRM_GEM_SHMEM_HELPER + select DRM_PIXEL_HELPER help 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. @@ -186,6 +190,7 @@ config TINYDRM_REPAPER select DRM_CLIENT_SELECTION select DRM_KMS_HELPER select DRM_GEM_DMA_HELPER + select DRM_PIXEL_HELPER help DRM driver for the following Pervasive Displays panels: 1.44" TFT EPD Panel (E1144CS021) @@ -201,6 +206,7 @@ config TINYDRM_SHARP_MEMORY select DRM_CLIENT_SELECTION select DRM_GEM_DMA_HELPER select DRM_KMS_HELPER + select DRM_PIXEL_HELPER help DRM Driver for the following Sharp Memory Panels: * 1.00" Sharp Memory LCD (LS010B7DH04) diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index 8192decddbc1..2744fe26dbeb 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -13,6 +13,7 @@ #include <drm/drm_edid.h> #include <drm/drm_fbdev_shmem.h> #include <drm/drm_fourcc.h> +#include <drm/drm_format_helper.h> #include <drm/drm_framebuffer.h> #include <drm/drm_gem_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> -- 2.56.0
