Commit 4d15125d authored by Maxime Ripard's avatar Maxime Ripard

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: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-9-eafee11b84b3@kernel.orgSigned-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent e075e496
...@@ -92,11 +92,11 @@ config DRM_FSL_LDB ...@@ -92,11 +92,11 @@ config DRM_FSL_LDB
config DRM_ITE_IT6505 config DRM_ITE_IT6505
tristate "ITE IT6505 DisplayPort bridge" tristate "ITE IT6505 DisplayPort bridge"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_DP_HELPER select DRM_DP_HELPER
select EXTCON select EXTCON
...@@ -226,10 +226,10 @@ config DRM_PARADE_PS8622 ...@@ -226,10 +226,10 @@ config DRM_PARADE_PS8622
config DRM_PARADE_PS8640 config DRM_PARADE_PS8640
tristate "Parade PS8640 MIPI DSI to eDP Converter" tristate "Parade PS8640 MIPI DSI to eDP Converter"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_MIPI_DSI select DRM_MIPI_DSI
select DRM_PANEL select DRM_PANEL
...@@ -381,6 +381,7 @@ config DRM_TI_SN65DSI83 ...@@ -381,6 +381,7 @@ config DRM_TI_SN65DSI83
config DRM_TI_SN65DSI86 config DRM_TI_SN65DSI86
tristate "TI SN65DSI86 DSI to eDP bridge" tristate "TI SN65DSI86 DSI to eDP bridge"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
...@@ -389,7 +390,6 @@ config DRM_TI_SN65DSI86 ...@@ -389,7 +390,6 @@ config DRM_TI_SN65DSI86
select DRM_PANEL select DRM_PANEL
select DRM_MIPI_DSI select DRM_MIPI_DSI
select AUXILIARY_BUS select AUXILIARY_BUS
select DRM_DISPLAY_DP_AUX_BUS
help help
Texas Instruments SN65DSI86 DSI to eDP Bridge driver Texas Instruments SN65DSI86 DSI to eDP Bridge driver
......
...@@ -33,11 +33,11 @@ config DRM_ANALOGIX_DP ...@@ -33,11 +33,11 @@ config DRM_ANALOGIX_DP
config DRM_ANALOGIX_ANX7625 config DRM_ANALOGIX_ANX7625
tristate "Analogix Anx7625 MIPI to DP interface support" tristate "Analogix Anx7625 MIPI to DP interface support"
depends on DRM depends on DRM
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDCP_HELPER select DRM_DISPLAY_HDCP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_MIPI_DSI select DRM_MIPI_DSI
help help
ANX7625 is an ultra-low power 4K mobile HD transmitter ANX7625 is an ultra-low power 4K mobile HD transmitter
......
...@@ -11,6 +11,7 @@ config DRM_DISPLAY_DP_AUX_BUS ...@@ -11,6 +11,7 @@ config DRM_DISPLAY_DP_AUX_BUS
tristate "DRM DisplayPort AUX bus support" tristate "DRM DisplayPort AUX bus support"
depends on DRM depends on DRM
depends on OF || COMPILE_TEST depends on OF || COMPILE_TEST
default y
config DRM_DISPLAY_DP_AUX_CEC config DRM_DISPLAY_DP_AUX_CEC
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support" bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
......
...@@ -22,11 +22,11 @@ config DRM_MEDIATEK ...@@ -22,11 +22,11 @@ config DRM_MEDIATEK
config DRM_MEDIATEK_DP config DRM_MEDIATEK_DP
tristate "DRM DPTX Support for MediaTek SoCs" tristate "DRM DPTX Support for MediaTek SoCs"
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on DRM_MEDIATEK depends on DRM_MEDIATEK
select PHY_MTK_DP select PHY_MTK_DP
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
help help
DRM/KMS Display Port driver for MediaTek SoCs. DRM/KMS Display Port driver for MediaTek SoCs.
......
...@@ -5,6 +5,7 @@ config DRM_MSM ...@@ -5,6 +5,7 @@ config DRM_MSM
depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST depends on ARCH_QCOM || SOC_IMX5 || COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
depends on DRM depends on DRM
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on IOMMU_SUPPORT depends on IOMMU_SUPPORT
depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
...@@ -15,7 +16,6 @@ config DRM_MSM ...@@ -15,7 +16,6 @@ config DRM_MSM
select IOMMU_IO_PGTABLE select IOMMU_IO_PGTABLE
select QCOM_MDT_LOADER if ARCH_QCOM select QCOM_MDT_LOADER if ARCH_QCOM
select REGULATOR select REGULATOR
select DRM_DISPLAY_DP_AUX_BUS
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_EXEC select DRM_EXEC
select DRM_KMS_HELPER select DRM_KMS_HELPER
......
...@@ -560,11 +560,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01 ...@@ -560,11 +560,11 @@ config DRM_PANEL_SAMSUNG_S6E88A0_AMS452EF01
config DRM_PANEL_SAMSUNG_ATNA33XC20 config DRM_PANEL_SAMSUNG_ATNA33XC20
tristate "Samsung ATNA33XC20 eDP panel" tristate "Samsung ATNA33XC20 eDP panel"
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
depends on PM depends on PM
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
help help
DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
be handled by the DRM_PANEL_SIMPLE driver because its power be handled by the DRM_PANEL_SIMPLE driver because its power
...@@ -800,12 +800,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015 ...@@ -800,12 +800,12 @@ config DRM_PANEL_STARTEK_KD070FHFID015
config DRM_PANEL_EDP config DRM_PANEL_EDP
tristate "support for simple Embedded DisplayPort panels" tristate "support for simple Embedded DisplayPort panels"
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
depends on PM depends on PM
select VIDEOMODE_HELPERS select VIDEOMODE_HELPERS
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
help help
DRM panel driver for dumb eDP panels that need at most a regulator and DRM panel driver for dumb eDP panels that need at most a regulator and
......
...@@ -4,11 +4,11 @@ config DRM_TEGRA ...@@ -4,11 +4,11 @@ config DRM_TEGRA
depends on ARCH_TEGRA || COMPILE_TEST depends on ARCH_TEGRA || COMPILE_TEST
depends on COMMON_CLK depends on COMMON_CLK
depends on DRM depends on DRM
depends on DRM_DISPLAY_DP_AUX_BUS
depends on DRM_DISPLAY_HELPER depends on DRM_DISPLAY_HELPER
depends on OF depends on OF
select DRM_DISPLAY_DP_HELPER select DRM_DISPLAY_DP_HELPER
select DRM_DISPLAY_HDMI_HELPER select DRM_DISPLAY_HDMI_HELPER
select DRM_DISPLAY_DP_AUX_BUS
select DRM_KMS_HELPER select DRM_KMS_HELPER
select DRM_MIPI_DSI select DRM_MIPI_DSI
select DRM_PANEL select DRM_PANEL
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment