Skip to content

Commit f6d2dc0

Browse files
mripardmripard
committed
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: Jani Nikula <jani.nikula@intel.com> Link: https://lore.kernel.org/r/20240327-kms-kconfig-helpers-v3-12-eafee11b84b3@kernel.org Signed-off-by: Maxime Ripard <mripard@kernel.org>
1 parent 3166e7e commit f6d2dc0

8 files changed

Lines changed: 8 additions & 7 deletions

File tree

‎drivers/gpu/drm/amd/amdgpu/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,12 @@ config DRM_AMDGPU
55
depends on DRM
66
depends on DRM_DISPLAY_DP_HELPER
77
depends on DRM_DISPLAY_HDCP_HELPER
8+
depends on DRM_DISPLAY_HDMI_HELPER
89
depends on DRM_DISPLAY_HELPER
910
depends on MMU
1011
depends on PCI
1112
depends on !UML
1213
select FW_LOADER
13-
select DRM_DISPLAY_HDMI_HELPER
1414
select DRM_KMS_HELPER
1515
select DRM_SCHED
1616
select DRM_TTM

‎drivers/gpu/drm/bridge/synopsys/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DRM_DW_HDMI
33
tristate
4+
depends on DRM_DISPLAY_HDMI_HELPER
45
depends on DRM_DISPLAY_HELPER
5-
select DRM_DISPLAY_HDMI_HELPER
66
select DRM_KMS_HELPER
77
select REGMAP_MMIO
88
select CEC_CORE if CEC_NOTIFIER

‎drivers/gpu/drm/display/Kconfig‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,5 +74,6 @@ config DRM_DISPLAY_HDCP_HELPER
7474
config DRM_DISPLAY_HDMI_HELPER
7575
bool "DRM HDMI Helpers"
7676
depends on DRM_DISPLAY_HELPER
77+
default y
7778
help
7879
DRM display helpers for HDMI.

‎drivers/gpu/drm/i915/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ config DRM_I915
44
depends on DRM
55
depends on DRM_DISPLAY_DP_HELPER
66
depends on DRM_DISPLAY_HDCP_HELPER
7+
depends on DRM_DISPLAY_HDMI_HELPER
78
depends on DRM_DISPLAY_HELPER
89
depends on X86 && PCI
910
depends on !PREEMPT_RT
@@ -13,7 +14,6 @@ config DRM_I915
1314
# the shmem_readpage() which depends upon tmpfs
1415
select SHMEM
1516
select TMPFS
16-
select DRM_DISPLAY_HDMI_HELPER
1717
select DRM_KMS_HELPER
1818
select DRM_PANEL
1919
select DRM_MIPI_DSI

‎drivers/gpu/drm/nouveau/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ config DRM_NOUVEAU
33
tristate "Nouveau (NVIDIA) cards"
44
depends on DRM
55
depends on DRM_DISPLAY_DP_HELPER
6+
depends on DRM_DISPLAY_HDMI_HELPER
67
depends on DRM_DISPLAY_HELPER
78
depends on PCI
89
depends on MMU
910
select IOMMU_API
1011
select FW_LOADER
11-
select DRM_DISPLAY_HDMI_HELPER
1212
select DRM_KMS_HELPER
1313
select DRM_TTM
1414
select DRM_TTM_HELPER

‎drivers/gpu/drm/tegra/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ config DRM_TEGRA
66
depends on DRM
77
depends on DRM_DISPLAY_DP_AUX_BUS
88
depends on DRM_DISPLAY_DP_HELPER
9+
depends on DRM_DISPLAY_HDMI_HELPER
910
depends on DRM_DISPLAY_HELPER
1011
depends on OF
11-
select DRM_DISPLAY_HDMI_HELPER
1212
select DRM_KMS_HELPER
1313
select DRM_MIPI_DSI
1414
select DRM_PANEL

‎drivers/gpu/drm/vc4/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ config DRM_VC4
44
depends on ARCH_BCM || ARCH_BCM2835 || COMPILE_TEST
55
depends on COMMON_CLK
66
depends on DRM
7+
depends on DRM_DISPLAY_HDMI_HELPER
78
depends on DRM_DISPLAY_HELPER
89
depends on PM
910
# Make sure not 'y' when RASPBERRYPI_FIRMWARE is 'm'. This can only
1011
# happen when COMPILE_TEST=y, hence the added !RASPBERRYPI_FIRMWARE.
1112
depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
1213
depends on SND && SND_SOC
13-
select DRM_DISPLAY_HDMI_HELPER
1414
select DRM_KMS_HELPER
1515
select DRM_GEM_DMA_HELPER
1616
select DRM_PANEL_BRIDGE

‎drivers/gpu/drm/xe/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ config DRM_XE
55
depends on DRM
66
depends on DRM_DISPLAY_DP_HELPER
77
depends on DRM_DISPLAY_HDCP_HELPER
8+
depends on DRM_DISPLAY_HDMI_HELPER
89
depends on DRM_DISPLAY_HELPER
910
depends on MMU
1011
depends on PCI
@@ -19,7 +20,6 @@ config DRM_XE
1920
select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
2021
select DRM_PANEL
2122
select DRM_SUBALLOC_HELPER
22-
select DRM_DISPLAY_HDMI_HELPER
2323
select DRM_MIPI_DSI
2424
select RELAY
2525
select IRQ_WORK

0 commit comments

Comments
 (0)