Skip to content

Commit d7c128c

Browse files
geertumripard
geertu
authored and
mripard
committed
Revert "drm: Switch DRM_DISPLAY_HDMI_HELPER to depends on"
This reverts commit f6d2dc0, 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 <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/bd288a5943dab8609f2d1f2bf413595a61df727a.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <[email protected]>
1 parent d738adc commit d7c128c

File tree

8 files changed

+7
-8
lines changed

8 files changed

+7
-8
lines changed

‎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
98
depends on DRM_DISPLAY_HELPER
109
depends on MMU
1110
depends on PCI
1211
depends on !UML
1312
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
54
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: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,5 @@ 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
7877
help
7978
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,7 +4,6 @@ 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
87
depends on DRM_DISPLAY_HELPER
98
depends on X86 && PCI
109
depends on !PREEMPT_RT
@@ -14,6 +13,7 @@ config DRM_I915
1413
# the shmem_readpage() which depends upon tmpfs
1514
select SHMEM
1615
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
76
depends on DRM_DISPLAY_HELPER
87
depends on PCI
98
depends on MMU
109
select IOMMU_API
1110
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
109
depends on DRM_DISPLAY_HELPER
1110
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
87
depends on DRM_DISPLAY_HELPER
98
depends on PM
109
# Make sure not 'y' when RASPBERRYPI_FIRMWARE is 'm'. This can only
1110
# happen when COMPILE_TEST=y, hence the added !RASPBERRYPI_FIRMWARE.
1211
depends on RASPBERRYPI_FIRMWARE || (COMPILE_TEST && !RASPBERRYPI_FIRMWARE)
1312
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,7 +5,6 @@ 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
98
depends on DRM_DISPLAY_HELPER
109
depends on MMU
1110
depends on PCI
@@ -20,6 +19,7 @@ config DRM_XE
2019
select DRM_KUNIT_TEST_HELPERS if DRM_XE_KUNIT_TEST != n
2120
select DRM_PANEL
2221
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)