Unverified Commit d7c128cb authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Maxime Ripard
Browse files

Revert "drm: Switch DRM_DISPLAY_HDMI_HELPER to depends on" 



This reverts commit f6d2dc03, 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: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://patchwork.freedesktop.org/patch/msgid/bd288a5943dab8609f2d1f2bf413595a61df727a.1713780345.git.geert+renesas@glider.be


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

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

+0 −1
Original line number Diff line number Diff line
@@ -74,6 +74,5 @@ 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,7 +4,6 @@ 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
@@ -14,6 +13,7 @@ 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