Unverified Commit f6d2dc03 authored by Maxime Ripard's avatar Maxime Ripard
Browse files

drm: Switch DRM_DISPLAY_HDMI_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_HDMI_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-12-eafee11b84b3@kernel.org


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

drivers/gpu/drm/amd/amdgpu/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -5,12 +5,12 @@ config DRM_AMDGPU 
	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDCP_HELPER

	depends on DRM_DISPLAY_HDMI_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_KMS_HELPER

	select DRM_SCHED

	select DRM_TTM

drivers/gpu/drm/bridge/synopsys/Kconfig

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_DW_HDMI

	tristate

	depends on DRM_DISPLAY_HDMI_HELPER

	depends on DRM_DISPLAY_HELPER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_KMS_HELPER

	select REGMAP_MMIO

	select CEC_CORE if CEC_NOTIFIER

drivers/gpu/drm/display/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -74,5 +74,6 @@ config DRM_DISPLAY_HDCP_HELPER 
config DRM_DISPLAY_HDMI_HELPER

	bool "DRM HDMI Helpers"

	depends on DRM_DISPLAY_HELPER

	default y

	help

	  DRM display helpers for HDMI.

drivers/gpu/drm/i915/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config DRM_I915 
	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDCP_HELPER

	depends on DRM_DISPLAY_HDMI_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on X86 && PCI

	depends on !PREEMPT_RT
@@ -13,7 +14,6 @@ config DRM_I915 
	# the shmem_readpage() which depends upon tmpfs

	select SHMEM

	select TMPFS

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_KMS_HELPER

	select DRM_PANEL

	select DRM_MIPI_DSI

drivers/gpu/drm/nouveau/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -3,12 +3,12 @@ config DRM_NOUVEAU 
	tristate "Nouveau (NVIDIA) cards"

	depends on DRM

	depends on DRM_DISPLAY_DP_HELPER

	depends on DRM_DISPLAY_HDMI_HELPER

	depends on DRM_DISPLAY_HELPER

	depends on PCI

	depends on MMU

	select IOMMU_API

	select FW_LOADER

	select DRM_DISPLAY_HDMI_HELPER

	select DRM_KMS_HELPER

	select DRM_TTM

	select DRM_TTM_HELPER