drm: Switch DRM_DISPLAY_HDCP_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_HDCP_HELPER to depend on it.

Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-11-eafee11b84b3@kernel.org
Signed-off-by: Maxime Ripard <mripard@kernel.org>

diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig b/drivers/gpu/drm/amd/amdgpu/Kconfig
index ba09121e7debb24769577a974250ff9c0ab2447e..1662dc49f18ed11e051b10b59c0db5c9c3ca950c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/Kconfig
+++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
@@ -4,13 +4,13 @@ config DRM_AMDGPU
        tristate "AMD GPU"
        depends on DRM
        depends on DRM_DISPLAY_DP_HELPER
+       depends on DRM_DISPLAY_HDCP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on MMU
        depends on PCI
        depends on !UML
        select FW_LOADER
        select DRM_DISPLAY_HDMI_HELPER
-       select DRM_DISPLAY_HDCP_HELPER
        select DRM_KMS_HELPER
        select DRM_SCHED
        select DRM_TTM

diff --git a/drivers/gpu/drm/bridge/Kconfig b/drivers/gpu/drm/bridge/Kconfig
index 54d45dd31b7f4d00db5108cbae5312c7d4c25c33..6e6ec300ab16faa7c099f076a0bb9190dcbf286c 100644 (file)
--- a/drivers/gpu/drm/bridge/Kconfig
+++ b/drivers/gpu/drm/bridge/Kconfig
@@ -94,9 +94,9 @@ 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_HDCP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
-       select DRM_DISPLAY_HDCP_HELPER
        select DRM_KMS_HELPER
        select DRM_DP_HELPER
        select EXTCON

diff --git a/drivers/gpu/drm/bridge/analogix/Kconfig b/drivers/gpu/drm/bridge/analogix/Kconfig
index 9659df6718de6db4279d0cf6c3c8505234f952ce..12bfea53bf24b2c25703eee821db4796bf1038af 100644 (file)
--- a/drivers/gpu/drm/bridge/analogix/Kconfig
+++ b/drivers/gpu/drm/bridge/analogix/Kconfig
@@ -35,9 +35,9 @@ config DRM_ANALOGIX_ANX7625
        depends on DRM
        depends on DRM_DISPLAY_DP_AUX_BUS
        depends on DRM_DISPLAY_DP_HELPER
+       depends on DRM_DISPLAY_HDCP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
-       select DRM_DISPLAY_HDCP_HELPER
        select DRM_MIPI_DSI
        help
          ANX7625 is an ultra-low power 4K mobile HD transmitter

diff --git a/drivers/gpu/drm/bridge/cadence/Kconfig b/drivers/gpu/drm/bridge/cadence/Kconfig
index 3480fd4d0a5f76e413906c348e5887979a3d2288..7817f6f56607141f143d0c6d5fcdbe3716d16a61 100644 (file)
--- a/drivers/gpu/drm/bridge/cadence/Kconfig
+++ b/drivers/gpu/drm/bridge/cadence/Kconfig
@@ -24,9 +24,9 @@ endif
 config DRM_CDNS_MHDP8546
        tristate "Cadence DPI/DP bridge"
        depends on DRM_DISPLAY_DP_HELPER
+       depends on DRM_DISPLAY_HDCP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on OF
-       select DRM_DISPLAY_HDCP_HELPER
        select DRM_KMS_HELPER
        select DRM_PANEL_BRIDGE
        help

diff --git a/drivers/gpu/drm/display/Kconfig b/drivers/gpu/drm/display/Kconfig
index 9801f47a3704530dd59c0ac8a25eff24502944e7..d65f1a37c08c7cf8f4e1e41c3ea22d01ea95b444 100644 (file)
--- a/drivers/gpu/drm/display/Kconfig
+++ b/drivers/gpu/drm/display/Kconfig
@@ -67,6 +67,7 @@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
 config DRM_DISPLAY_HDCP_HELPER
        bool "DRM HDCD Helpers"
        depends on DRM_DISPLAY_HELPER
+       default y
        help
          DRM display helpers for HDCP.
 

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index dbde4e29d93a79dc620558f6d13b8d8e6f40a113..87ef8c4d72a53768a40a5f6474bb5e92495fc6a3 100644 (file)
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -3,6 +3,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_HDCP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on X86 && PCI
        depends on !PREEMPT_RT
@@ -12,7 +13,6 @@ config DRM_I915
        # the shmem_readpage() which depends upon tmpfs
        select SHMEM
        select TMPFS
-       select DRM_DISPLAY_HDCP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
        select DRM_KMS_HELPER
        select DRM_PANEL

diff --git a/drivers/gpu/drm/xe/Kconfig b/drivers/gpu/drm/xe/Kconfig
index 02da2faf5ae33bdb5a31955ed085a8765bdd243e..1fa8ef75823c7a6b99d549332690b1e5610d3557 100644 (file)
--- a/drivers/gpu/drm/xe/Kconfig
+++ b/drivers/gpu/drm/xe/Kconfig
@@ -4,6 +4,7 @@ config DRM_XE
        depends on (m || (y && KUNIT=y))
        depends on DRM
        depends on DRM_DISPLAY_DP_HELPER
+       depends on DRM_DISPLAY_HDCP_HELPER
        depends on DRM_DISPLAY_HELPER
        depends on MMU
        depends on PCI
@@ -18,7 +19,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_HDCP_HELPER
        select DRM_DISPLAY_HDMI_HELPER
        select DRM_MIPI_DSI
        select RELAY