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

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index ae29fcba9e1958b1305c5325c69d820533cb594b..b2148919b5930232f6699cde28b59734fdb19420 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -217,13 +217,6 @@ config DRM_GEM_CMA_HELPER
        help
          Choose this if you need the GEM CMA helper functions
 
-config DRM_KMS_CMA_HELPER
-       bool
-       depends on DRM
-       select DRM_GEM_CMA_HELPER
-       help
-         Choose this if you need the KMS CMA helper functions
-
 config DRM_GEM_SHMEM_HELPER
        tristate
        depends on DRM && MMU

diff --git a/drivers/gpu/drm/Makefile b/drivers/gpu/drm/Makefile
index 9dbf913993434fffcbc7de9e2dab02eeb85b2fd4..5b49ede0a134576601d4e40edf4e7eae9859be21 100644 (file)
--- a/drivers/gpu/drm/Makefile
+++ b/drivers/gpu/drm/Makefile
@@ -36,6 +36,7 @@ obj-$(CONFIG_DRM_DP_AUX_BUS) += drm_dp_aux_bus.o
 obj-$(CONFIG_DRM_NOMODESET) += drm_nomodeset.o
 
 drm_cma_helper-y := drm_gem_cma_helper.o
+drm_cma_helper-$(CONFIG_DRM_KMS_HELPER) += drm_fb_cma_helper.o
 obj-$(CONFIG_DRM_GEM_CMA_HELPER) += drm_cma_helper.o
 
 drm_shmem_helper-y := drm_gem_shmem_helper.o
@@ -60,7 +61,6 @@ drm_kms_helper-y := drm_bridge_connector.o drm_crtc_helper.o drm_dp_helper.o \
 
 drm_kms_helper-$(CONFIG_DRM_PANEL_BRIDGE) += bridge/panel.o
 drm_kms_helper-$(CONFIG_DRM_FBDEV_EMULATION) += drm_fb_helper.o
-drm_kms_helper-$(CONFIG_DRM_KMS_CMA_HELPER) += drm_fb_cma_helper.o
 drm_kms_helper-$(CONFIG_DRM_DP_AUX_CHARDEV) += drm_dp_aux_dev.o
 drm_kms_helper-$(CONFIG_DRM_DP_CEC) += drm_dp_cec.o
 

diff --git a/drivers/gpu/drm/arm/Kconfig b/drivers/gpu/drm/arm/Kconfig
index 3a9e966e0e78b80804851990d1ae09af468fe156..58a242871b28ee5a11d8a80e0c3913d6d6ce6ccf 100644 (file)
--- a/drivers/gpu/drm/arm/Kconfig
+++ b/drivers/gpu/drm/arm/Kconfig
@@ -6,7 +6,6 @@ config DRM_HDLCD
        depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)
        depends on COMMON_CLK
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        help
          Choose this option if you have an ARM High Definition Colour LCD
          controller.
@@ -27,7 +26,6 @@ config DRM_MALI_DISPLAY
        depends on DRM && OF && (ARM || ARM64 || COMPILE_TEST)
        depends on COMMON_CLK
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select VIDEOMODE_HELPERS
        help

diff --git a/drivers/gpu/drm/arm/display/Kconfig b/drivers/gpu/drm/arm/display/Kconfig
index cec0639e3aa1fc8cdd6c846759bb9212444133c9..e91598b60781aad3cecbcd1fcd4a80f9f43a48d3 100644 (file)
--- a/drivers/gpu/drm/arm/display/Kconfig
+++ b/drivers/gpu/drm/arm/display/Kconfig
@@ -4,7 +4,6 @@ config DRM_KOMEDA
        depends on DRM && OF
        depends on COMMON_CLK
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select VIDEOMODE_HELPERS
        help

diff --git a/drivers/gpu/drm/aspeed/Kconfig b/drivers/gpu/drm/aspeed/Kconfig
index 5e95bcea43e92cb0e83ea68866a11358e47ae3b3..36c4a7e8698134802ddc055fb089d1d19a80ed8b 100644 (file)
--- a/drivers/gpu/drm/aspeed/Kconfig
+++ b/drivers/gpu/drm/aspeed/Kconfig
@@ -5,7 +5,6 @@ config DRM_ASPEED_GFX
        depends on (COMPILE_TEST || ARCH_ASPEED)
        depends on MMU
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DMA_CMA if HAVE_DMA_CONTIGUOUS
        select CMA if HAVE_DMA_CONTIGUOUS
        select MFD_SYSCON

diff --git a/drivers/gpu/drm/atmel-hlcdc/Kconfig b/drivers/gpu/drm/atmel-hlcdc/Kconfig
index 5f67f001553bd46ae960ecd06aab2b06deddb490..8ae679f1a51852306f27d7a8a48b4b5b92a0fead 100644 (file)
--- a/drivers/gpu/drm/atmel-hlcdc/Kconfig
+++ b/drivers/gpu/drm/atmel-hlcdc/Kconfig
@@ -4,7 +4,6 @@ config DRM_ATMEL_HLCDC
        depends on DRM && OF && COMMON_CLK && MFD_ATMEL_HLCDC && ARM
        select DRM_GEM_CMA_HELPER
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_PANEL
        help
          Choose this option if you have an ATMEL SoC with an HLCDC display

diff --git a/drivers/gpu/drm/fsl-dcu/Kconfig b/drivers/gpu/drm/fsl-dcu/Kconfig
index d7dd8ba90e3af9f567457b8e8fb4dd05e505d501..2a13ea5c85397801a07fc5413391d69f4505948e 100644 (file)
--- a/drivers/gpu/drm/fsl-dcu/Kconfig
+++ b/drivers/gpu/drm/fsl-dcu/Kconfig
@@ -4,7 +4,6 @@ config DRM_FSL_DCU
        depends on DRM && OF && ARM && COMMON_CLK
        select BACKLIGHT_CLASS_DEVICE
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_PANEL
        select REGMAP_MMIO
        select VIDEOMODE_HELPERS

diff --git a/drivers/gpu/drm/hisilicon/kirin/Kconfig b/drivers/gpu/drm/hisilicon/kirin/Kconfig
index 290553e2f6b4160dd518ac2fce412790d5a92194..b770f7662830836b1c7b79ff9cff728938b54563 100644 (file)
--- a/drivers/gpu/drm/hisilicon/kirin/Kconfig
+++ b/drivers/gpu/drm/hisilicon/kirin/Kconfig
@@ -4,7 +4,6 @@ config DRM_HISI_KIRIN
        depends on DRM && OF && ARM64
        select DRM_KMS_HELPER
        select DRM_GEM_CMA_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_MIPI_DSI
        help
          Choose this option if you have a hisilicon Kirin chipsets(hi6220).

diff --git a/drivers/gpu/drm/imx/Kconfig b/drivers/gpu/drm/imx/Kconfig
index b5fa0e45a839d621b6a83d33ae20825d8c6fc3f6..bb9738c7c825d5e46328e6e754028e505787bc45 100644 (file)
--- a/drivers/gpu/drm/imx/Kconfig
+++ b/drivers/gpu/drm/imx/Kconfig
@@ -4,7 +4,7 @@ config DRM_IMX
        select DRM_KMS_HELPER
        select VIDEOMODE_HELPERS
        select DRM_GEM_CMA_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_KMS_HELPER
        depends on DRM && (ARCH_MXC || ARCH_MULTIPLATFORM || COMPILE_TEST)
        depends on IMX_IPUV3_CORE
        help

diff --git a/drivers/gpu/drm/imx/dcss/Kconfig b/drivers/gpu/drm/imx/dcss/Kconfig
index 2b17a964ff05aab48f2d00c1cc38adc0716f4a98..7374f1952762e672cb99493d1ba5a75ec0f901d5 100644 (file)
--- a/drivers/gpu/drm/imx/dcss/Kconfig
+++ b/drivers/gpu/drm/imx/dcss/Kconfig
@@ -1,7 +1,7 @@
 config DRM_IMX_DCSS
        tristate "i.MX8MQ DCSS"
        select IMX_IRQSTEER
-       select DRM_KMS_CMA_HELPER
+       select DRM_KMS_HELPER
        select VIDEOMODE_HELPERS
        depends on DRM && ARCH_MXC && ARM64
        help

diff --git a/drivers/gpu/drm/ingenic/Kconfig b/drivers/gpu/drm/ingenic/Kconfig
index 3b57f8be007c4aa7d64cd03f396b77a3af5c3c72..001f59fb06d56e17fa0b33e0090ebb6fb3937d70 100644 (file)
--- a/drivers/gpu/drm/ingenic/Kconfig
+++ b/drivers/gpu/drm/ingenic/Kconfig
@@ -8,7 +8,6 @@ config DRM_INGENIC
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE
        help

diff --git a/drivers/gpu/drm/kmb/Kconfig b/drivers/gpu/drm/kmb/Kconfig
index bc4cb5e1cd8a7b42964aa6b013918b750279c94f..5fdd43dad507a1b71cdc698d840b072bcf96e112 100644 (file)
--- a/drivers/gpu/drm/kmb/Kconfig
+++ b/drivers/gpu/drm/kmb/Kconfig
@@ -3,7 +3,6 @@ config DRM_KMB_DISPLAY
        depends on DRM
        depends on ARCH_KEEMBAY || COMPILE_TEST
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DSI
        help

diff --git a/drivers/gpu/drm/mcde/Kconfig b/drivers/gpu/drm/mcde/Kconfig
index 71c689b573c90103e94cb1e136c3fdc71aa332bc..d0bf1bc8da3fec56c9d0367238b4698ef2710dc4 100644 (file)
--- a/drivers/gpu/drm/mcde/Kconfig
+++ b/drivers/gpu/drm/mcde/Kconfig
@@ -10,7 +10,6 @@ config DRM_MCDE
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE
        help

diff --git a/drivers/gpu/drm/meson/Kconfig b/drivers/gpu/drm/meson/Kconfig
index a4e1ed96e5e8be752faf10168b5be1354c50143e..6c70fc3214af276d29ea16325ae7e695560fa9e9 100644 (file)
--- a/drivers/gpu/drm/meson/Kconfig
+++ b/drivers/gpu/drm/meson/Kconfig
@@ -4,7 +4,6 @@ config DRM_MESON
        depends on DRM && OF && (ARM || ARM64)
        depends on ARCH_MESON || COMPILE_TEST
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select DRM_DISPLAY_CONNECTOR
        select VIDEOMODE_HELPERS

diff --git a/drivers/gpu/drm/mxsfb/Kconfig b/drivers/gpu/drm/mxsfb/Kconfig
index ee22cd25d3e3d72f42526587668c146c5a68d87c..987170e16ebd68dac59eadf2643d9b3f89f42a89 100644 (file)
--- a/drivers/gpu/drm/mxsfb/Kconfig
+++ b/drivers/gpu/drm/mxsfb/Kconfig
@@ -10,7 +10,7 @@ config DRM_MXSFB
        depends on COMMON_CLK
        select DRM_MXS
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_PANEL
        select DRM_PANEL_BRIDGE
        help

diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index 7770b18022916b04b84e3695791f5bd6762fe698..434c2861bb40c0a4be85fece9abb340c2483ca50 100644 (file)
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -152,7 +152,7 @@ config DRM_PANEL_ILITEK_ILI9341
        tristate "Ilitek ILI9341 240x320 QVGA panels"
        depends on OF && SPI
        depends on DRM_KMS_HELPER
-       depends on DRM_KMS_CMA_HELPER
+       depends on DRM_GEM_CMA_HELPER
        depends on BACKLIGHT_CLASS_DEVICE
        select DRM_MIPI_DBI
        help

diff --git a/drivers/gpu/drm/pl111/Kconfig b/drivers/gpu/drm/pl111/Kconfig
index 3aae387a96af298ddb35cc8bd211558ba25c3c39..91ee05b013037fb94d212a7ada995064238972d4 100644 (file)
--- a/drivers/gpu/drm/pl111/Kconfig
+++ b/drivers/gpu/drm/pl111/Kconfig
@@ -6,7 +6,6 @@ config DRM_PL111
        depends on VEXPRESS_CONFIG || VEXPRESS_CONFIG=n
        depends on COMMON_CLK
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE

diff --git a/drivers/gpu/drm/rcar-du/Kconfig b/drivers/gpu/drm/rcar-du/Kconfig
index b47e74421e34791a736b51242b9b00eaf79adbc3..71a4611e15573d2f210bc667cbc31c748800c82e 100644 (file)
--- a/drivers/gpu/drm/rcar-du/Kconfig
+++ b/drivers/gpu/drm/rcar-du/Kconfig
@@ -7,7 +7,6 @@ config DRM_RCAR_DU
        imply DRM_RCAR_CMM
        imply DRM_RCAR_LVDS
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select VIDEOMODE_HELPERS
        help

diff --git a/drivers/gpu/drm/shmobile/Kconfig b/drivers/gpu/drm/shmobile/Kconfig
index e2a6c82c8252d8a291431d94b288aca989d2624f..288b838a904a211ef16c206ca582dac0444d6507 100644 (file)
--- a/drivers/gpu/drm/shmobile/Kconfig
+++ b/drivers/gpu/drm/shmobile/Kconfig
@@ -5,7 +5,6 @@ config DRM_SHMOBILE
        depends on ARCH_SHMOBILE || COMPILE_TEST
        select BACKLIGHT_CLASS_DEVICE
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        help
          Choose this option if you have an SH Mobile chipset.

diff --git a/drivers/gpu/drm/sti/Kconfig b/drivers/gpu/drm/sti/Kconfig
index d0cfdd36b38f5be3a54ce070909b94316f49ed43..246a94afbe745417e0cdbfc861cd588d7cfa4504 100644 (file)
--- a/drivers/gpu/drm/sti/Kconfig
+++ b/drivers/gpu/drm/sti/Kconfig
@@ -5,7 +5,6 @@ config DRM_STI
        select RESET_CONTROLLER
        select DRM_KMS_HELPER
        select DRM_GEM_CMA_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_PANEL
        select FW_LOADER
        select SND_SOC_HDMI_CODEC if SND_SOC

diff --git a/drivers/gpu/drm/stm/Kconfig b/drivers/gpu/drm/stm/Kconfig
index b7d66915a2be3996d92353e8d401b1f3c137452f..e0379488cd0d2e1724687f8cb803e359ed91f11d 100644 (file)
--- a/drivers/gpu/drm/stm/Kconfig
+++ b/drivers/gpu/drm/stm/Kconfig
@@ -4,7 +4,6 @@ config DRM_STM
        depends on DRM && (ARCH_STM32 || ARCH_MULTIPLATFORM)
        select DRM_KMS_HELPER
        select DRM_GEM_CMA_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_PANEL_BRIDGE
        select VIDEOMODE_HELPERS
        select FB_PROVIDE_GET_FB_UNMAPPED_AREA if FB

diff --git a/drivers/gpu/drm/sun4i/Kconfig b/drivers/gpu/drm/sun4i/Kconfig
index 5755f0432e77435bca7942430c05ee2dc9e84d31..92651f6a9e7d960bbefd4c40b9b95849141ac728 100644 (file)
--- a/drivers/gpu/drm/sun4i/Kconfig
+++ b/drivers/gpu/drm/sun4i/Kconfig
@@ -5,7 +5,6 @@ config DRM_SUN4I
        depends on ARCH_SUNXI || COMPILE_TEST
        select DRM_GEM_CMA_HELPER
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_PANEL
        select REGMAP_MMIO
        select VIDEOMODE_HELPERS

diff --git a/drivers/gpu/drm/tidss/Kconfig b/drivers/gpu/drm/tidss/Kconfig
index f790a5215302f59f5aa1a3a4b2e4ccaf11fcb3ca..bc4fa59b6fa9a395dc659026c3caaef3c05cba88 100644 (file)
--- a/drivers/gpu/drm/tidss/Kconfig
+++ b/drivers/gpu/drm/tidss/Kconfig
@@ -3,7 +3,6 @@ config DRM_TIDSS
        depends on DRM && OF
        depends on ARM || ARM64 || COMPILE_TEST
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        help
          The TI Keystone family SoCs introduced a new generation of

diff --git a/drivers/gpu/drm/tilcdc/Kconfig b/drivers/gpu/drm/tilcdc/Kconfig
index 9f505a149990e901c5a5f0c0edc24f7da9557af8..e315591eb36b80c41e3041f8d6af566f643e0910 100644 (file)
--- a/drivers/gpu/drm/tilcdc/Kconfig
+++ b/drivers/gpu/drm/tilcdc/Kconfig
@@ -3,7 +3,6 @@ config DRM_TILCDC
        tristate "DRM Support for TI LCDC Display Controller"
        depends on DRM && OF && ARM
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE

diff --git a/drivers/gpu/drm/tiny/Kconfig b/drivers/gpu/drm/tiny/Kconfig
index 4ca309f80deeda2f808cdb1b82defc2ca65d7cfe..712e0004e96ec71de8ee563aa6d29b5fa9ada723 100644 (file)
--- a/drivers/gpu/drm/tiny/Kconfig
+++ b/drivers/gpu/drm/tiny/Kconfig
@@ -3,7 +3,7 @@
 config DRM_ARCPGU
        tristate "ARC PGU"
        depends on DRM && OF
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_KMS_HELPER
        help
          Choose this option if you have an ARC PGU controller.
@@ -71,7 +71,7 @@ config TINYDRM_HX8357D
        tristate "DRM support for HX8357D display panels"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -84,7 +84,7 @@ config TINYDRM_ILI9163
        tristate "DRM support for ILI9163 display panels"
        depends on DRM && SPI
        select BACKLIGHT_CLASS_DEVICE
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_KMS_HELPER
        select DRM_MIPI_DBI
        help
@@ -97,7 +97,7 @@ config TINYDRM_ILI9225
        tristate "DRM support for ILI9225 display panels"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        help
          DRM driver for the following Ilitek ILI9225 panels:
@@ -109,7 +109,7 @@ config TINYDRM_ILI9341
        tristate "DRM support for ILI9341 display panels"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -122,7 +122,7 @@ config TINYDRM_ILI9486
        tristate "DRM support for ILI9486 display panels"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -136,7 +136,7 @@ config TINYDRM_MI0283QT
        tristate "DRM support for MI0283QT"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help
@@ -147,7 +147,7 @@ config TINYDRM_REPAPER
        tristate "DRM support for Pervasive Displays RePaper panels (V231)"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        help
          DRM driver for the following Pervasive Displays panels:
          1.44" TFT EPD Panel (E1144CS021)
@@ -161,7 +161,7 @@ config TINYDRM_ST7586
        tristate "DRM support for Sitronix ST7586 display panels"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        help
          DRM driver for the following Sitronix ST7586 panels:
@@ -173,7 +173,7 @@ config TINYDRM_ST7735R
        tristate "DRM support for Sitronix ST7715R/ST7735R display panels"
        depends on DRM && SPI
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
+       select DRM_GEM_CMA_HELPER
        select DRM_MIPI_DBI
        select BACKLIGHT_CLASS_DEVICE
        help

diff --git a/drivers/gpu/drm/tve200/Kconfig b/drivers/gpu/drm/tve200/Kconfig
index e2d163c74ed633c37d5a6bdd72bc3148022fcc0b..47a7dbe6c11480ad8ce4d6fee8289d6abb6ba487 100644 (file)
--- a/drivers/gpu/drm/tve200/Kconfig
+++ b/drivers/gpu/drm/tve200/Kconfig
@@ -8,7 +8,6 @@ config DRM_TVE200
        select DRM_BRIDGE
        select DRM_PANEL_BRIDGE
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select VT_HW_CONSOLE_BINDING if FRAMEBUFFER_CONSOLE
        help

diff --git a/drivers/gpu/drm/vc4/Kconfig b/drivers/gpu/drm/vc4/Kconfig
index 345a5570a3da7d138c8df5238cd645d83cf8b7cd..de3424fed2fc7cc1fb88073b039eb8affcddec7b 100644 (file)
--- a/drivers/gpu/drm/vc4/Kconfig
+++ b/drivers/gpu/drm/vc4/Kconfig
@@ -6,7 +6,6 @@ config DRM_VC4
        depends on SND && SND_SOC
        depends on COMMON_CLK
        select DRM_KMS_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_GEM_CMA_HELPER
        select DRM_PANEL_BRIDGE
        select SND_PCM

diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig
index c3d08269faa93f79673f10a4985d13d5372938fc..d8d38d86d5c657455ba5135e35c5d8174001ad7a 100644 (file)
--- a/drivers/gpu/drm/xlnx/Kconfig
+++ b/drivers/gpu/drm/xlnx/Kconfig
@@ -7,7 +7,6 @@ config DRM_ZYNQMP_DPSUB
        depends on XILINX_ZYNQMP_DPDMA
        select DMA_ENGINE
        select DRM_GEM_CMA_HELPER
-       select DRM_KMS_CMA_HELPER
        select DRM_KMS_HELPER
        select GENERIC_PHY
        help