Commit 09717af7 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

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: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Link: https://patchwork.freedesktop.org/patch/msgid/20211106193509.17472-3-tzimmermann@suse.de
parent c47160d8

drivers/gpu/drm/Kconfig

+0 −7
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/arm/Kconfig

+0 −2
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/arm/display/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/aspeed/Kconfig

+0 −1
Original line number Diff line number Diff line
@@ -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