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 1eb9394..50b8093 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 cf931b9..ba09121 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 5d0193a..54d45dd 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 ec98c94..9659df6 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 20143af..3480fd4 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 0cd4396..9801f47 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 4b0183b..6a26a0b 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 43183a6..dbde4e2 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 2add544..6caab8d 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 28a8987..f770859 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 5ac852b..7cc305b 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 0123539..154f5bf 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 07d3304..18c8672 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 b72c0bb..4b49a14 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 e0385d1..bb6e352 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 be29e5c..02da2fa 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 7a14a8c..41d753b 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