Unverified Commit 3166e7e6 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

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: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-11-eafee11b84b3@kernel.org


Signed-off-by: default avatarMaxime Ripard <mripard@kernel.org>
parent 0323287d

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/bridge/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/bridge/analogix/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/bridge/cadence/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -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

drivers/gpu/drm/display/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -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.