Unverified Commit 0323287d authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Switch DRM_DISPLAY_DP_HELPER to depends on 



Most of our helpers have relied on being selected so far through
Kconfig, but that creates issues when we have multiple layers of helpers
with some depending on others.

Indeed, select doesn't select a dependency's dependencies, and thus
isn't super intuitive. Depends on however doesn't have that limitation,
so we can just switch all the drivers that were selecting
DRM_DISPLAY_DP_HELPER to depend on it.

Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-10-eafee11b84b3@kernel.org


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 4d15125d

drivers/gpu/drm/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ config DRM_KUNIT_TEST_HELPERS 
config DRM_KUNIT_TEST

	tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS

	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on KUNIT

	depends on MMU

	select DRM_BUDDY

	select DRM_DISPLAY_DP_HELPER

	select DRM_EXEC

	select DRM_EXPORT_FOR_TESTS if m

	select DRM_GEM_SHMEM_HELPER

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ 
config DRM_AMDGPU

	tristate "AMD GPU"

	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on MMU

	depends on PCI

	depends on !UML

	select FW_LOADER

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_KMS_HELPER

drivers/gpu/drm/bridge/Kconfig

+5 −5
Original line number Diff line number Diff line
@@ -93,9 +93,9 @@ config DRM_FSL_LDB 
config DRM_ITE_IT6505

	tristate "ITE IT6505 DisplayPort bridge"

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_KMS_HELPER

	select DRM_DP_HELPER
@@ -227,9 +227,9 @@ config DRM_PARADE_PS8622 
config DRM_PARADE_PS8640

	tristate "Parade PS8640 MIPI DSI to eDP Converter"

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select DRM_MIPI_DSI

	select DRM_PANEL
@@ -313,9 +313,9 @@ config DRM_TOSHIBA_TC358764 


config DRM_TOSHIBA_TC358767

	tristate "Toshiba TC358767 eDP bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_MIPI_DSI
@@ -336,9 +336,9 @@ config DRM_TOSHIBA_TC358768 


config DRM_TOSHIBA_TC358775

	tristate "Toshiba TC358775 DSI/LVDS bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_PANEL
@@ -382,9 +382,9 @@ config DRM_TI_SN65DSI83 
config DRM_TI_SN65DSI86

	tristate "TI SN65DSI86 DSI to eDP bridge"

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	select DRM_PANEL

drivers/gpu/drm/bridge/analogix/Kconfig

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_ANALOGIX_ANX6345

	tristate "Analogix ANX6345 bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_ANALOGIX_DP

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	help
@@ -15,9 +15,9 @@ config DRM_ANALOGIX_ANX6345 


config DRM_ANALOGIX_ANX78XX

	tristate "Analogix ANX78XX bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	select DRM_ANALOGIX_DP

	select DRM_DISPLAY_DP_HELPER

	select DRM_KMS_HELPER

	select REGMAP_I2C

	help
@@ -34,9 +34,9 @@ config DRM_ANALOGIX_ANX7625 
	tristate "Analogix Anx7625 MIPI to DP interface support"

	depends on DRM

	depends on DRM_DISPLAY_DP_AUX_BUS

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_MIPI_DSI

	help

drivers/gpu/drm/bridge/cadence/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -23,9 +23,9 @@ endif 


config DRM_CDNS_MHDP8546

	tristate "Cadence DPI/DP bridge"

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on OF

	select DRM_DISPLAY_DP_HELPER

	select DRM_DISPLAY_HDCP_HELPER

	select DRM_KMS_HELPER

	select DRM_PANEL_BRIDGE