mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-04-29 12:28:27 +02:00
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>
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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.
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user