drm: Switch DRM_DISPLAY_DP_AUX_BUS 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_AUX_BUS to depend on it.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-9-eafee11b84b3@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index aa870e68e165f2888f480faf20ccfd2e68d47cce..5d0193a87314388f1adb1f93d49c754dec69aa38 100644 (file)
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -92,11 +92,11 @@ config DRM_FSL_LDB
 
 config DRM_ITE_IT6505
        tristate "ITE IT6505 DisplayPort bridge"
+       depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_HELPER
        depends on OF
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDCP_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        select DRM_KMS_HELPER
        select DRM_DP_HELPER
        select EXTCON
@@ -226,10 +226,10 @@ 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_HELPER
        depends on OF
        select DRM_DISPLAY_DP_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI
        select DRM_PANEL
@@ -381,6 +381,7 @@ 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_HELPER
        depends on OF
        select DRM_DISPLAY_DP_HELPER
@@ -389,7 +390,6 @@ config DRM_TI_SN65DSI86
        select DRM_PANEL
        select DRM_MIPI_DSI
        select AUXILIARY_BUS
-       select DRM_DISPLAY_DP_AUX_BUS
        help
          Texas Instruments SN65DSI86 DSI to eDP Bridge driver
 

diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig
index 16d18dde483ae9c43905d2f7b4f49f80400251be..ec98c94535736c0aae324085ec39661cdad8e892 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/Kconfig
+++ b/drivers/gpu/drm/bridge/analogix/Kconfig
@@ -33,11 +33,11 @@ config DRM_ANALOGIX_DP
 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_HELPER
        depends on OF
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDCP_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        select DRM_MIPI_DSI
        help
          ANX7625 is an ultra-low power 4K mobile HD transmitter

diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig
index cffa2acdbc6c0988114857783b1b578b571e60cc..0cd439691422422682fb7c3369fdbb01ba86694e 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -11,6 +11,7 @@ config DRM_DISPLAY_DP_AUX_BUS
        tristate "DRM DisplayPort AUX bus support"
        depends on DRM
        depends on OF || COMPILE_TEST
+       default y
 
 config DRM_DISPLAY_DP_AUX_CEC
        bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"

diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
index 50bb28327f65fbf53ea03ec6b9e0c3766b7218fd..2add54486ac4ab118bbcab0b377923a6f10e9a11 100644 (file)
--- a/drivers/gpu/drm/mediatek/Kconfig
+++ b/drivers/gpu/drm/mediatek/Kconfig
@@ -22,11 +22,11 @@ config DRM_MEDIATEK
 
 config DRM_MEDIATEK_DP
        tristate "DRM DPTX Support for MediaTek SoCs"
+       depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_HELPER
        depends on DRM_MEDIATEK
        select PHY_MTK_DP
        select DRM_DISPLAY_DP_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        help
          DRM/KMS Display Port driver for MediaTek SoCs.
 

diff --git a/drivers/gpu/drm/msm/Kconfig b/drivers/gpu/drm/msm/Kconfig
index 2055266506e5adf0d6867370fffd89178e364274..28a898722ace789bedd37d9d34e6d9cb0f0219f6 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -5,6 +5,7 @@ config DRM_MSM
        depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST
        depends on COMMON_CLK
        depends on DRM
+       depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_HELPER
        depends on IOMMU_SUPPORT
        depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
@@ -15,7 +16,6 @@ config DRM_MSM
        select IOMMU_IO_PGTABLE
        select QCOM_MDT_LOADER if ARCH_QCOM
        select REGULATOR
-       select DRM_DISPLAY_DP_AUX_BUS
        select DRM_DISPLAY_DP_HELPER
        select DRM_EXEC
        select DRM_KMS_HELPER

diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index c83285811bb33cc2eb1f865ee559c0448643a4c5..01235397c4938e77a5d695086dfcc7a40daca26d 100644 (file)
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -560,11 +560,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01
 config DRM_PANEL_SAMSUNG_ATNA33XC20
        tristate "Samsung ATNA33XC20 eDP panel"
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_HELPER
        depends on OF
        depends on PM
        select DRM_DISPLAY_DP_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        help
          DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
          be handled by the DRM_PANEL_SIMPLE driver because its power
@@ -800,12 +800,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015
 config DRM_PANEL_EDP
        tristate "support for simple Embedded DisplayPort panels"
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_HELPER
        depends on OF
        depends on PM
        select VIDEOMODE_HELPERS
        select DRM_DISPLAY_DP_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        select DRM_KMS_HELPER
        help
          DRM panel driver for dumb eDP panels that need at most a regulator and

diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
index 44381ee6ea9e36f755f67b2ea64255e5a28d1055..e0385d175ec6d266da9ab5f849bc73776df66cd4 100644 (file)
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@ -4,11 +4,11 @@ config DRM_TEGRA
        depends on ARCH_TEGRA || COMPILE_TEST
        depends on COMMON_CLK
        depends on DRM
+       depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_HELPER
        depends on OF
        select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
-       select DRM_DISPLAY_DP_AUX_BUS
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI
        select DRM_PANEL