Revert "drm: Switch DRM_DISPLAY_DP_HELPER to depends on"

This reverts commit 0323287de87d7e6e9c22c57d7440aa353a2298d0, 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/89ac456805746b6d0c888f10c5120b11aacd3319.1713780345.git.geert+renesas@glider.be
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/Kconfig b/drivers/gpu/drm/Kconfig
index 959b19a0410188d93ef5be804eb6b0b22396939b..33792ca3eeb7ae8de9cef00924faf4596e400017 100644 (file)
--- a/drivers/gpu/drm/Kconfig
+++ b/drivers/gpu/drm/Kconfig
@@ -75,11 +75,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 ba09121e7debb24769577a974250ff9c0ab2447e..cf931b94a1889746277d744d7f7266d66d22612d 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 801d5b7d3e5da0816cad6f472806ac95d370dd72..7d1da1780415822c9ce28bd3ca25bd8fed3ffa44 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 EXTCON
@@ -233,9 +233,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
@@ -319,9 +319,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
@@ -342,9 +342,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
@@ -388,9 +388,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 9659df6718de6db4279d0cf6c3c8505234f952ce..ec98c94535736c0aae324085ec39661cdad8e892 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 3480fd4d0a5f76e413906c348e5887979a3d2288..20143afded40e4378cc3b4a13080a9792dad8efb 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 9801f47a3704530dd59c0ac8a25eff24502944e7..0cd439691422422682fb7c3369fdbb01ba86694e 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -39,7 +39,6 @@ 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 6a26a0b8eff2c021caa22b709bc4eebe57a2e76d..4b0183bf221c8bb26caaa7c0639d03ca5e87b5b6 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 dbde4e29d93a79dc620558f6d13b8d8e6f40a113..43183a68a09557b711cba134df2cee471e45ffc6 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -2,7 +2,6 @@
 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
@@ -12,6 +11,7 @@ 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 6caab8d4d4e0f5f8264aad9de5918828ec79c92e..2add54486ac4ab118bbcab0b377923a6f10e9a11 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 f7708590583e7377c7b6274577b4b2ec2247f317..28a898722ace789bedd37d9d34e6d9cb0f0219f6 100644 (file)
--- a/drivers/gpu/drm/msm/Kconfig
+++ b/drivers/gpu/drm/msm/Kconfig
@@ -6,7 +6,6 @@ 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
@@ -17,6 +16,7 @@ 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 7cc305b2826d6abc8b5c1a2c8baf0c67fb456cb8..5ac852b816db262bc4a10c23c2decb4461f822a9 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 e54f6f5604edd05d17c635d99aa6f7c56af21df2..0a0d97464f0202a75afe89c67f411ed22e4eda3f 100644 (file)
--- a/drivers/gpu/drm/panel/Kconfig
+++ b/drivers/gpu/drm/panel/Kconfig
@@ -545,10 +545,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.
@@ -584,10 +584,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
@@ -824,11 +824,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
@@ -903,10 +903,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 18c867219a706a1730d142d0931b0ab2065c432f..07d330450f05f899920250688b4b91561699ba60 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 4b49a14758fe04128e0385ada0d5451d53344d9e..b72c0bbf346da5fa8c0839e3590fc4dd6aaa761e 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 bb6e35261f1144b1a50b60f84a65159f9da5daa6..e0385d175ec6d266da9ab5f849bc73776df66cd4 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 d97b3f4af5ed0b5b0b16b9421616f4b8412b5579..4407e14338fce9c8f9a2324551af7495cdc5e9f3 100644 (file)
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -3,7 +3,6 @@ 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
@@ -18,6 +17,7 @@ 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 41d753b14ccd957473cfbb38175ee3fe1b259556..7a14a8c2e7be9e597ab66c58cde72e2aa2da2eb6 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