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: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-10-eafee11b84b3@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 1eb939463c35ac2c459f15e38cfd4253a5f356c9..50b809346bf9c7461964c670cd185560e490cfb9 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -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

diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index cf931b94a1889746277d744d7f7266d66d22612d..ba09121e7debb24769577a974250ff9c0ab2447e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -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

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 5d0193a87314388f1adb1f93d49c754dec69aa38..54d45dd31b7f4d00db5108cbae5312c7d4c25c33 100644 (file)
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -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

diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig
index ec98c94535736c0aae324085ec39661cdad8e892..9659df6718de6db4279d0cf6c3c8505234f952ce 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/Kconfig
+++ b/drivers/gpu/drm/bridge/analogix/Kconfig
@@ -1,10 +1,10 @@
 # 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

diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cadence/Kconfig
index 20143afded40e4378cc3b4a13080a9792dad8efb..3480fd4d0a5f76e413906c348e5887979a3d2288 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/Kconfig
+++ b/drivers/gpu/drm/bridge/cadence/Kconfig
@@ -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

diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig
index 0cd439691422422682fb7c3369fdbb01ba86694e..9801f47a3704530dd59c0ac8a25eff24502944e7 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -39,6 +39,7 @@ config DRM_DISPLAY_DP_AUX_CHARDEV
 config DRM_DISPLAY_DP_HELPER
        bool "DRM DisplayPort Helpers"
        depends on DRM_DISPLAY_HELPER
+       default y
        help
          DRM display helpers for DisplayPort.
 

diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 4b0183bf221c8bb26caaa7c0639d03ca5e87b5b6..6a26a0b8eff2c021caa22b709bc4eebe57a2e76d 100644 (file)
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -67,9 +67,9 @@ config DRM_EXYNOS_DSI
 config DRM_EXYNOS_DP
        bool "Exynos specific extensions for Analogix DP driver"
        depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        select DRM_ANALOGIX_DP
-       select DRM_DISPLAY_DP_HELPER
        default DRM_EXYNOS
        select DRM_PANEL
        help

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 43183a68a09557b711cba134df2cee471e45ffc6..dbde4e29d93a79dc620558f6d13b8d8e6f40a113 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -2,6 +2,7 @@
 config DRM_I915
        tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
        depends on DRM
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on X86 && PCI
        depends on !PREEMPT_RT
@@ -11,7 +12,6 @@ config DRM_I915
        # the shmem_readpage() which depends upon tmpfs
        select SHMEM
        select TMPFS
-       select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER

diff --git a/drivers/gpu/drm/mediatek/Kconfig b/drivers/gpu/drm/mediatek/Kconfig
index 2add54486ac4ab118bbcab0b377923a6f10e9a11..6caab8d4d4e0f5f8264aad9de5918828ec79c92e 100644 (file)
--- a/drivers/gpu/drm/mediatek/Kconfig
+++ b/drivers/gpu/drm/mediatek/Kconfig
@@ -23,10 +23,10 @@ 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_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on DRM_MEDIATEK
        select PHY_MTK_DP
-       select DRM_DISPLAY_DP_HELPER
        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..f7708590583e7377c7b6274577b4b2ec2247f317 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -6,6 +6,7 @@ config DRM_MSM
        depends on COMMON_CLK
        depends on DRM
        depends on DRM_DISPLAY_DP_AUX_BUS
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on IOMMU_SUPPORT
        depends on QCOM_AOSS_QMP || QCOM_AOSS_QMP=n
@@ -16,7 +17,6 @@ config DRM_MSM
        select IOMMU_IO_PGTABLE
        select QCOM_MDT_LOADER if ARCH_QCOM
        select REGULATOR
-       select DRM_DISPLAY_DP_HELPER
        select DRM_EXEC
        select DRM_KMS_HELPER
        select DRM_PANEL

diff --git a/drivers/gpu/drm/nouveau/Kconfig b/drivers/gpu/drm/nouveau/Kconfig
index 5ac852b816db262bc4a10c23c2decb4461f822a9..7cc305b2826d6abc8b5c1a2c8baf0c67fb456cb8 100644 (file)
--- a/drivers/gpu/drm/nouveau/Kconfig
+++ b/drivers/gpu/drm/nouveau/Kconfig
@@ -2,12 +2,12 @@
 config DRM_NOUVEAU
        tristate "Nouveau (NVIDIA) cards"
        depends on DRM
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on PCI
        depends on MMU
        select IOMMU_API
        select FW_LOADER
-       select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_TTM

diff --git a/drivers/gpu/drm/panel/Kconfig b/drivers/gpu/drm/panel/Kconfig
index 01235397c4938e77a5d695086dfcc7a40daca26d..154f5bf82980eac4f0bf4bde6df256c84131cf35 100644 (file)
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -534,10 +534,10 @@ config DRM_PANEL_RAYDIUM_RM68200
 config DRM_PANEL_RAYDIUM_RM692E5
        tristate "Raydium RM692E5-based DSI panel"
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on DRM_MIPI_DSI
        depends on OF
-       select DRM_DISPLAY_DP_HELPER
        help
          Say Y here if you want to enable support for Raydium RM692E5-based
          display panels, such as the one found in the Fairphone 5 smartphone.
@@ -561,10 +561,10 @@ 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_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
        depends on PM
-       select DRM_DISPLAY_DP_HELPER
        help
          DRM panel driver for the Samsung ATNA33XC20 panel. This panel can't
          be handled by the DRM_PANEL_SIMPLE driver because its power
@@ -801,11 +801,11 @@ 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_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
        depends on PM
        select VIDEOMODE_HELPERS
-       select DRM_DISPLAY_DP_HELPER
        select DRM_KMS_HELPER
        help
          DRM panel driver for dumb eDP panels that need at most a regulator and
@@ -880,10 +880,10 @@ config DRM_PANEL_TRULY_NT35597_WQXGA
 config DRM_PANEL_VISIONOX_R66451
        tristate "Visionox R66451"
        depends on BACKLIGHT_CLASS_DEVICE
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on DRM_MIPI_DSI
        depends on OF
-       select DRM_DISPLAY_DP_HELPER
        help
          Say Y here if you want to enable support for Visionox
          R66451 1080x2340 AMOLED DSI panel.

diff --git a/drivers/gpu/drm/radeon/Kconfig b/drivers/gpu/drm/radeon/Kconfig
index 07d330450f05f899920250688b4b91561699ba60..18c867219a706a1730d142d0931b0ab2065c432f 100644 (file)
--- a/drivers/gpu/drm/radeon/Kconfig
+++ b/drivers/gpu/drm/radeon/Kconfig
@@ -4,11 +4,11 @@ config DRM_RADEON
        tristate "ATI Radeon"
        depends on AGP || !AGP
        depends on DRM
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on PCI
        depends on MMU
        select FW_LOADER
-       select DRM_DISPLAY_DP_HELPER
         select DRM_KMS_HELPER
        select DRM_SUBALLOC_HELPER
         select DRM_TTM

diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index b72c0bbf346da5fa8c0839e3590fc4dd6aaa761e..4b49a14758fe04128e0385ada0d5451d53344d9e 100644 (file)
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -35,9 +35,9 @@ config ROCKCHIP_VOP2
 
 config ROCKCHIP_ANALOGIX_DP
        bool "Rockchip specific extensions for Analogix DP driver"
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on ROCKCHIP_VOP
-       select DRM_DISPLAY_DP_HELPER
        help
          This selects support for Rockchip SoC specific extensions
          for the Analogix Core DP driver. If you want to enable DP
@@ -45,9 +45,9 @@ config ROCKCHIP_ANALOGIX_DP
 
 config ROCKCHIP_CDN_DP
        bool "Rockchip cdn DP"
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
-       select DRM_DISPLAY_DP_HELPER
        help
          This selects support for Rockchip SoC specific extensions
          for the cdn DP driver. If you want to enable Dp on

diff --git a/drivers/gpu/drm/tegra/Kconfig b/drivers/gpu/drm/tegra/Kconfig
index e0385d175ec6d266da9ab5f849bc73776df66cd4..bb6e35261f1144b1a50b60f84a65159f9da5daa6 100644 (file)
--- a/drivers/gpu/drm/tegra/Kconfig
+++ b/drivers/gpu/drm/tegra/Kconfig
@@ -5,9 +5,9 @@ config DRM_TEGRA
        depends on COMMON_CLK
        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_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_MIPI_DSI

diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index be29e5cd5215e842d4550b15e585997af0b503ee..02da2faf5ae33bdb5a31955ed085a8765bdd243e 100644 (file)
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -3,6 +3,7 @@ config DRM_XE
        tristate "Intel Xe Graphics"
        depends on (m || (y && KUNIT=y))
        depends on DRM
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on MMU
        depends on PCI
@@ -17,7 +18,6 @@ config DRM_XE
        select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
        select DRM_PANEL
        select DRM_SUBALLOC_HELPER
-       select DRM_DISPLAY_DP_HELPER
        select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
        select DRM_MIPI_DSI

diff --git a/drivers/gpu/drm/xlnx/Kconfig b/drivers/gpu/drm/xlnx/Kconfig
index 7a14a8c2e7be9e597ab66c58cde72e2aa2da2eb6..41d753b14ccd957473cfbb38175ee3fe1b259556 100644 (file)
--- a/drivers/gpu/drm/xlnx/Kconfig
+++ b/drivers/gpu/drm/xlnx/Kconfig
@@ -4,12 +4,12 @@ config DRM_ZYNQMP_DPSUB
        depends on COMMON_CLK
        depends on DMADEVICES
        depends on DRM
+       depends on DRM_DISPLAY_DP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
        depends on PHY_XILINX_ZYNQMP
        depends on XILINX_ZYNQMP_DPDMA
        select DMA_ENGINE
-       select DRM_DISPLAY_DP_HELPER
        select DRM_GEM_DMA_HELPER
        select DRM_KMS_HELPER
        select GENERIC_PHY