tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drm: Remove CONFIG_DRM_KMS_CMA_HELPER option

Link drm_fb_cma_helper.o into drm_cma_helper.ko if CONFIG_DRM_KMS_HELPER
has been set. Remove CONFIG_DRM_KMS_CMA_HELPER config option. Selecting
KMS helpers and CMA will now automatically enable CMA KMS helpers.

Some drivers' Kconfig files did not correctly select KMS or CMA helpers.
Fix this as part of the change.

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211106193509.17472-3-tzimmermann@suse.de

Thomas Zimmermann 09717af7 c47160d8

+15 -44
-7
drivers/gpu/drm/Kconfig
··· 217 217 help 218 218 Choose this if you need the GEM CMA helper functions 219 219 220 - config DRM_KMS_CMA_HELPER 221 - bool 222 - depends on DRM 223 - select DRM_GEM_CMA_HELPER 224 - help 225 - Choose this if you need the KMS CMA helper functions 226 - 227 220 config DRM_GEM_SHMEM_HELPER 228 221 tristate 229 222 depends on DRM && MMU
+1 -1
drivers/gpu/drm/Makefile
··· 36 36 obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o 37 37 38 38 drm_cma_helper-y := drm_gem_cma_helper.o 39 + drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_cma_helper.o 39 40 obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o 40 41 41 42 drm_shmem_helper-y := drm_gem_shmem_helper.o ··· 61 60 62 61 drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o 63 62 drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o 64 - drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o 65 63 drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o 66 64 drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o 67 65
-2
drivers/gpu/drm/arm/Kconfig
··· 6 6 depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST) 7 7 depends on COMMON_CLK 8 8 select DRM_KMS_HELPER 9 - select DRM_KMS_CMA_HELPER 10 9 help 11 10 Choose this option if you have an ARM High Definition Colour LCD 12 11 controller. ··· 26 27 depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST) 27 28 depends on COMMON_CLK 28 29 select DRM_KMS_HELPER 29 - select DRM_KMS_CMA_HELPER 30 30 select DRM_GEM_CMA_HELPER 31 31 select VIDEOMODE_HELPERS 32 32 help
-1
drivers/gpu/drm/arm/display/Kconfig
··· 4 4 depends on DRM && OF 5 5 depends on COMMON_CLK 6 6 select DRM_KMS_HELPER 7 - select DRM_KMS_CMA_HELPER 8 7 select DRM_GEM_CMA_HELPER 9 8 select VIDEOMODE_HELPERS 10 9 help
-1
drivers/gpu/drm/aspeed/Kconfig
··· 5 5 depends on (COMPILE_TEST || ARCH_ASPEED) 6 6 depends on MMU 7 7 select DRM_KMS_HELPER 8 - select DRM_KMS_CMA_HELPER 9 8 select DMA_CMA if HAVE_DMA_CONTIGUOUS 10 9 select CMA if HAVE_DMA_CONTIGUOUS 11 10 select MFD_SYSCON
-1
drivers/gpu/drm/atmel-hlcdc/Kconfig
··· 4 4 depends on DRM && OF && COMMON_CLK && MFD_ATMEL_HLCDC && ARM 5 5 select DRM_GEM_CMA_HELPER 6 6 select DRM_KMS_HELPER 7 - select DRM_KMS_CMA_HELPER 8 7 select DRM_PANEL 9 8 help 10 9 Choose this option if you have an ATMEL SoC with an HLCDC display
-1
drivers/gpu/drm/fsl-dcu/Kconfig
··· 4 4 depends on DRM && OF && ARM && COMMON_CLK 5 5 select BACKLIGHT_CLASS_DEVICE 6 6 select DRM_KMS_HELPER 7 - select DRM_KMS_CMA_HELPER 8 7 select DRM_PANEL 9 8 select REGMAP_MMIO 10 9 select VIDEOMODE_HELPERS
-1
drivers/gpu/drm/hisilicon/kirin/Kconfig
··· 4 4 depends on DRM && OF && ARM64 5 5 select DRM_KMS_HELPER 6 6 select DRM_GEM_CMA_HELPER 7 - select DRM_KMS_CMA_HELPER 8 7 select DRM_MIPI_DSI 9 8 help 10 9 Choose this option if you have a hisilicon Kirin chipsets(hi6220).
+1 -1
drivers/gpu/drm/imx/Kconfig
··· 4 4 select DRM_KMS_HELPER 5 5 select VIDEOMODE_HELPERS 6 6 select DRM_GEM_CMA_HELPER 7 - select DRM_KMS_CMA_HELPER 7 + select DRM_KMS_HELPER 8 8 depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST) 9 9 depends on IMX_IPUV3_CORE 10 10 help
+1 -1
drivers/gpu/drm/imx/dcss/Kconfig
··· 1 1 config DRM_IMX_DCSS 2 2 tristate "i.MX8MQ DCSS" 3 3 select IMX_IRQSTEER 4 - select DRM_KMS_CMA_HELPER 4 + select DRM_KMS_HELPER 5 5 select VIDEOMODE_HELPERS 6 6 depends on DRM && ARCH_MXC && ARM64 7 7 help
-1
drivers/gpu/drm/ingenic/Kconfig
··· 8 8 select DRM_BRIDGE 9 9 select DRM_PANEL_BRIDGE 10 10 select DRM_KMS_HELPER 11 - select DRM_KMS_CMA_HELPER 12 11 select DRM_GEM_CMA_HELPER 13 12 select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE 14 13 help
-1
drivers/gpu/drm/kmb/Kconfig
··· 3 3 depends on DRM 4 4 depends on ARCH_KEEMBAY || COMPILE_TEST 5 5 select DRM_KMS_HELPER 6 - select DRM_KMS_CMA_HELPER 7 6 select DRM_GEM_CMA_HELPER 8 7 select DRM_MIPI_DSI 9 8 help
-1
drivers/gpu/drm/mcde/Kconfig
··· 10 10 select DRM_BRIDGE 11 11 select DRM_PANEL_BRIDGE 12 12 select DRM_KMS_HELPER 13 - select DRM_KMS_CMA_HELPER 14 13 select DRM_GEM_CMA_HELPER 15 14 select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE 16 15 help
-1
drivers/gpu/drm/meson/Kconfig
··· 4 4 depends on DRM && OF && (ARM || ARM64) 5 5 depends on ARCH_MESON || COMPILE_TEST 6 6 select DRM_KMS_HELPER 7 - select DRM_KMS_CMA_HELPER 8 7 select DRM_GEM_CMA_HELPER 9 8 select DRM_DISPLAY_CONNECTOR 10 9 select VIDEOMODE_HELPERS
+1 -1
drivers/gpu/drm/mxsfb/Kconfig
··· 10 10 depends on COMMON_CLK 11 11 select DRM_MXS 12 12 select DRM_KMS_HELPER 13 - select DRM_KMS_CMA_HELPER 13 + select DRM_GEM_CMA_HELPER 14 14 select DRM_PANEL 15 15 select DRM_PANEL_BRIDGE 16 16 help
+1 -1
drivers/gpu/drm/panel/Kconfig
··· 152 152 tristate "Ilitek ILI9341 240x320 QVGA panels" 153 153 depends on OF && SPI 154 154 depends on DRM_KMS_HELPER 155 - depends on DRM_KMS_CMA_HELPER 155 + depends on DRM_GEM_CMA_HELPER 156 156 depends on BACKLIGHT_CLASS_DEVICE 157 157 select DRM_MIPI_DBI 158 158 help
-1
drivers/gpu/drm/pl111/Kconfig
··· 6 6 depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n 7 7 depends on COMMON_CLK 8 8 select DRM_KMS_HELPER 9 - select DRM_KMS_CMA_HELPER 10 9 select DRM_GEM_CMA_HELPER 11 10 select DRM_BRIDGE 12 11 select DRM_PANEL_BRIDGE
-1
drivers/gpu/drm/rcar-du/Kconfig
··· 7 7 imply DRM_RCAR_CMM 8 8 imply DRM_RCAR_LVDS 9 9 select DRM_KMS_HELPER 10 - select DRM_KMS_CMA_HELPER 11 10 select DRM_GEM_CMA_HELPER 12 11 select VIDEOMODE_HELPERS 13 12 help
-1
drivers/gpu/drm/shmobile/Kconfig
··· 5 5 depends on ARCH_SHMOBILE || COMPILE_TEST 6 6 select BACKLIGHT_CLASS_DEVICE 7 7 select DRM_KMS_HELPER 8 - select DRM_KMS_CMA_HELPER 9 8 select DRM_GEM_CMA_HELPER 10 9 help 11 10 Choose this option if you have an SH Mobile chipset.
-1
drivers/gpu/drm/sti/Kconfig
··· 5 5 select RESET_CONTROLLER 6 6 select DRM_KMS_HELPER 7 7 select DRM_GEM_CMA_HELPER 8 - select DRM_KMS_CMA_HELPER 9 8 select DRM_PANEL 10 9 select FW_LOADER 11 10 select SND_SOC_HDMI_CODEC if SND_SOC
-1
drivers/gpu/drm/stm/Kconfig
··· 4 4 depends on DRM && (ARCH_STM32 || ARCH_MULTIPLATFORM) 5 5 select DRM_KMS_HELPER 6 6 select DRM_GEM_CMA_HELPER 7 - select DRM_KMS_CMA_HELPER 8 7 select DRM_PANEL_BRIDGE 9 8 select VIDEOMODE_HELPERS 10 9 select FB_PROVIDE_GET_FB_UNMAPPED_AREA if FB
-1
drivers/gpu/drm/sun4i/Kconfig
··· 5 5 depends on ARCH_SUNXI || COMPILE_TEST 6 6 select DRM_GEM_CMA_HELPER 7 7 select DRM_KMS_HELPER 8 - select DRM_KMS_CMA_HELPER 9 8 select DRM_PANEL 10 9 select REGMAP_MMIO 11 10 select VIDEOMODE_HELPERS
-1
drivers/gpu/drm/tidss/Kconfig
··· 3 3 depends on DRM && OF 4 4 depends on ARM || ARM64 || COMPILE_TEST 5 5 select DRM_KMS_HELPER 6 - select DRM_KMS_CMA_HELPER 7 6 select DRM_GEM_CMA_HELPER 8 7 help 9 8 The TI Keystone family SoCs introduced a new generation of
-1
drivers/gpu/drm/tilcdc/Kconfig
··· 3 3 tristate "DRM Support for TI LCDC Display Controller" 4 4 depends on DRM && OF && ARM 5 5 select DRM_KMS_HELPER 6 - select DRM_KMS_CMA_HELPER 7 6 select DRM_GEM_CMA_HELPER 8 7 select DRM_BRIDGE 9 8 select DRM_PANEL_BRIDGE
+10 -10
drivers/gpu/drm/tiny/Kconfig
··· 3 3 config DRM_ARCPGU 4 4 tristate "ARC PGU" 5 5 depends on DRM && OF 6 - select DRM_KMS_CMA_HELPER 6 + select DRM_GEM_CMA_HELPER 7 7 select DRM_KMS_HELPER 8 8 help 9 9 Choose this option if you have an ARC PGU controller. ··· 71 71 tristate "DRM support for HX8357D display panels" 72 72 depends on DRM && SPI 73 73 select DRM_KMS_HELPER 74 - select DRM_KMS_CMA_HELPER 74 + select DRM_GEM_CMA_HELPER 75 75 select DRM_MIPI_DBI 76 76 select BACKLIGHT_CLASS_DEVICE 77 77 help ··· 84 84 tristate "DRM support for ILI9163 display panels" 85 85 depends on DRM && SPI 86 86 select BACKLIGHT_CLASS_DEVICE 87 - select DRM_KMS_CMA_HELPER 87 + select DRM_GEM_CMA_HELPER 88 88 select DRM_KMS_HELPER 89 89 select DRM_MIPI_DBI 90 90 help ··· 97 97 tristate "DRM support for ILI9225 display panels" 98 98 depends on DRM && SPI 99 99 select DRM_KMS_HELPER 100 - select DRM_KMS_CMA_HELPER 100 + select DRM_GEM_CMA_HELPER 101 101 select DRM_MIPI_DBI 102 102 help 103 103 DRM driver for the following Ilitek ILI9225 panels: ··· 109 109 tristate "DRM support for ILI9341 display panels" 110 110 depends on DRM && SPI 111 111 select DRM_KMS_HELPER 112 - select DRM_KMS_CMA_HELPER 112 + select DRM_GEM_CMA_HELPER 113 113 select DRM_MIPI_DBI 114 114 select BACKLIGHT_CLASS_DEVICE 115 115 help ··· 122 122 tristate "DRM support for ILI9486 display panels" 123 123 depends on DRM && SPI 124 124 select DRM_KMS_HELPER 125 - select DRM_KMS_CMA_HELPER 125 + select DRM_GEM_CMA_HELPER 126 126 select DRM_MIPI_DBI 127 127 select BACKLIGHT_CLASS_DEVICE 128 128 help ··· 136 136 tristate "DRM support for MI0283QT" 137 137 depends on DRM && SPI 138 138 select DRM_KMS_HELPER 139 - select DRM_KMS_CMA_HELPER 139 + select DRM_GEM_CMA_HELPER 140 140 select DRM_MIPI_DBI 141 141 select BACKLIGHT_CLASS_DEVICE 142 142 help ··· 147 147 tristate "DRM support for Pervasive Displays RePaper panels (V231)" 148 148 depends on DRM && SPI 149 149 select DRM_KMS_HELPER 150 - select DRM_KMS_CMA_HELPER 150 + select DRM_GEM_CMA_HELPER 151 151 help 152 152 DRM driver for the following Pervasive Displays panels: 153 153 1.44" TFT EPD Panel (E1144CS021) ··· 161 161 tristate "DRM support for Sitronix ST7586 display panels" 162 162 depends on DRM && SPI 163 163 select DRM_KMS_HELPER 164 - select DRM_KMS_CMA_HELPER 164 + select DRM_GEM_CMA_HELPER 165 165 select DRM_MIPI_DBI 166 166 help 167 167 DRM driver for the following Sitronix ST7586 panels: ··· 173 173 tristate "DRM support for Sitronix ST7715R/ST7735R display panels" 174 174 depends on DRM && SPI 175 175 select DRM_KMS_HELPER 176 - select DRM_KMS_CMA_HELPER 176 + select DRM_GEM_CMA_HELPER 177 177 select DRM_MIPI_DBI 178 178 select BACKLIGHT_CLASS_DEVICE 179 179 help
-1
drivers/gpu/drm/tve200/Kconfig
··· 8 8 select DRM_BRIDGE 9 9 select DRM_PANEL_BRIDGE 10 10 select DRM_KMS_HELPER 11 - select DRM_KMS_CMA_HELPER 12 11 select DRM_GEM_CMA_HELPER 13 12 select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE 14 13 help
-1
drivers/gpu/drm/vc4/Kconfig
··· 6 6 depends on SND && SND_SOC 7 7 depends on COMMON_CLK 8 8 select DRM_KMS_HELPER 9 - select DRM_KMS_CMA_HELPER 10 9 select DRM_GEM_CMA_HELPER 11 10 select DRM_PANEL_BRIDGE 12 11 select SND_PCM
-1
drivers/gpu/drm/xlnx/Kconfig
··· 7 7 depends on XILINX_ZYNQMP_DPDMA 8 8 select DMA_ENGINE 9 9 select DRM_GEM_CMA_HELPER 10 - select DRM_KMS_CMA_HELPER 11 10 select DRM_KMS_HELPER 12 11 select GENERIC_PHY 13 12 help