Revert "drm: Switch DRM_DISPLAY_HDCP_HELPER to depends on"
This reverts commit 3166e7e6d935caaef07605a5c90773fbf9ffeaf4, 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/a40e70a0abd3d841c23c107d452a43fdd70ef37a.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <mripard@kernel.org>
This commit is contained in:
parent
d7c128cb77
commit
9573446953
@ -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 EXTCON
|
||||
select CRYPTO
|
||||
|
@ -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,7 +67,6 @@ 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,7 +3,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_HDCP_HELPER
|
||||
depends on DRM_DISPLAY_HELPER
|
||||
depends on X86 && PCI
|
||||
depends on !PREEMPT_RT
|
||||
@ -13,6 +12,7 @@ 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,7 +4,6 @@ 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
|
||||
@ -19,6 +18,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_HDCP_HELPER
|
||||
select DRM_DISPLAY_HDMI_HELPER
|
||||
select DRM_MIPI_DSI
|
||||
select RELAY
|
||||
|
Loading…
x
Reference in New Issue
Block a user