Revert "drm: Switch DRM_DISPLAY_DP_AUX_BUS to depends on"

This reverts commit 4d15125d7fe637f401e64e33c99513adf6586fdd, as helper
code should always be selected by the driver that needs it, for the
convenience of the final user configuring a kernel.

The user who configures a kernel should not need to know which helpers
are needed for the driver he is interested in.  Making a driver depend
on helper code means that the user needs to know which helpers to enable
first, which is very user-unfriendly.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/79824fec01eb9ab0673b9409f9b39cc8b5cc338d.1713780345.git.geert+renesas@glider.be
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 7d1da1780415822c9ce28bd3ca25bd8fed3ffa44..8c0883bc3f2aed2c04d7409c3cb6011315a1d3b6 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 EXTCON
        select CRYPTO
@@ -232,10 +232,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
@@ -387,7 +387,6 @@ 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
@@ -396,6 +395,7 @@ 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 ec98c94535736c0aae324085ec39661cdad8e892..16d18dde483ae9c43905d2f7b4f49f80400251be 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 0cd439691422422682fb7c3369fdbb01ba86694e..cffa2acdbc6c0988114857783b1b578b571e60cc 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -11,7 +11,6 @@ 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 2add54486ac4ab118bbcab0b377923a6f10e9a11..50bb28327f65fbf53ea03ec6b9e0c3766b7218fd 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 28a898722ace789bedd37d9d34e6d9cb0f0219f6..2055266506e5adf0d6867370fffd89178e364274 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -5,7 +5,6 @@ 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
@@ -16,6 +15,7 @@ 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 0a0d97464f0202a75afe89c67f411ed22e4eda3f..108ced2e8794118a4f2e99c99a95137e8cd8d69f 100644 (file)
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -583,11 +583,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
@@ -823,12 +823,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 e0385d175ec6d266da9ab5f849bc73776df66cd4..44381ee6ea9e36f755f67b2ea64255e5a28d1055 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