Skip to content

Commit 05b8b6d

Browse files
geertumripard
geertu
authored and
mripard
committed
Revert "drm: Switch DRM_DISPLAY_HELPER to depends on"
This reverts commit e075e49, 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 <geert+renesas@glider.be> Acked-by: Arnd Bergmann <arnd@arndb.de> Link: https://patchwork.freedesktop.org/patch/msgid/1ba76cc4d96a8afefff5d1bc42fb1e1329c5da68.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <mripard@kernel.org>
1 parent 1e0b9b4 commit 05b8b6d

19 files changed

Lines changed: 45 additions & 59 deletions

File tree

‎drivers/gpu/drm/Kconfig‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,12 +74,10 @@ config DRM_KUNIT_TEST_HELPERS
7474

7575
config DRM_KUNIT_TEST
7676
tristate "KUnit tests for DRM" if !KUNIT_ALL_TESTS
77-
depends on DRM
78-
depends on DRM_DISPLAY_HELPER
79-
depends on KUNIT
80-
depends on MMU
77+
depends on DRM && KUNIT && MMU
8178
select DRM_BUDDY
8279
select DRM_DISPLAY_DP_HELPER
80+
select DRM_DISPLAY_HELPER
8381
select DRM_EXEC
8482
select DRM_EXPORT_FOR_TESTS if m
8583
select DRM_GEM_SHMEM_HELPER

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,13 @@
22

33
config DRM_AMDGPU
44
tristate "AMD GPU"
5-
depends on DRM
6-
depends on DRM_DISPLAY_HELPER
7-
depends on MMU
8-
depends on PCI
5+
depends on DRM && PCI && MMU
96
depends on !UML
107
select FW_LOADER
118
select DRM_DISPLAY_DP_HELPER
129
select DRM_DISPLAY_HDMI_HELPER
1310
select DRM_DISPLAY_HDCP_HELPER
11+
select DRM_DISPLAY_HELPER
1412
select DRM_KMS_HELPER
1513
select DRM_SCHED
1614
select DRM_TTM

‎drivers/gpu/drm/bridge/Kconfig‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,10 +92,10 @@ config DRM_FSL_LDB
9292

9393
config DRM_ITE_IT6505
9494
tristate "ITE IT6505 DisplayPort bridge"
95-
depends on DRM_DISPLAY_HELPER
9695
depends on OF
9796
select DRM_DISPLAY_DP_HELPER
9897
select DRM_DISPLAY_HDCP_HELPER
98+
select DRM_DISPLAY_HELPER
9999
select DRM_DISPLAY_DP_AUX_BUS
100100
select DRM_KMS_HELPER
101101
select EXTCON
@@ -232,9 +232,9 @@ config DRM_PARADE_PS8622
232232

233233
config DRM_PARADE_PS8640
234234
tristate "Parade PS8640 MIPI DSI to eDP Converter"
235-
depends on DRM_DISPLAY_HELPER
236235
depends on OF
237236
select DRM_DISPLAY_DP_HELPER
237+
select DRM_DISPLAY_HELPER
238238
select DRM_DISPLAY_DP_AUX_BUS
239239
select DRM_KMS_HELPER
240240
select DRM_MIPI_DSI
@@ -319,9 +319,9 @@ config DRM_TOSHIBA_TC358764
319319

320320
config DRM_TOSHIBA_TC358767
321321
tristate "Toshiba TC358767 eDP bridge"
322-
depends on DRM_DISPLAY_HELPER
323322
depends on OF
324323
select DRM_DISPLAY_DP_HELPER
324+
select DRM_DISPLAY_HELPER
325325
select DRM_KMS_HELPER
326326
select REGMAP_I2C
327327
select DRM_MIPI_DSI
@@ -342,9 +342,9 @@ config DRM_TOSHIBA_TC358768
342342

343343
config DRM_TOSHIBA_TC358775
344344
tristate "Toshiba TC358775 DSI/LVDS bridge"
345-
depends on DRM_DISPLAY_HELPER
346345
depends on OF
347346
select DRM_DISPLAY_DP_HELPER
347+
select DRM_DISPLAY_HELPER
348348
select DRM_KMS_HELPER
349349
select REGMAP_I2C
350350
select DRM_PANEL
@@ -387,9 +387,9 @@ config DRM_TI_SN65DSI83
387387

388388
config DRM_TI_SN65DSI86
389389
tristate "TI SN65DSI86 DSI to eDP bridge"
390-
depends on DRM_DISPLAY_HELPER
391390
depends on OF
392391
select DRM_DISPLAY_DP_HELPER
392+
select DRM_DISPLAY_HELPER
393393
select DRM_KMS_HELPER
394394
select REGMAP_I2C
395395
select DRM_PANEL

‎drivers/gpu/drm/bridge/analogix/Kconfig‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DRM_ANALOGIX_ANX6345
33
tristate "Analogix ANX6345 bridge"
4-
depends on DRM_DISPLAY_HELPER
54
depends on OF
65
select DRM_ANALOGIX_DP
76
select DRM_DISPLAY_DP_HELPER
7+
select DRM_DISPLAY_HELPER
88
select DRM_KMS_HELPER
99
select REGMAP_I2C
1010
help
@@ -15,9 +15,9 @@ config DRM_ANALOGIX_ANX6345
1515

1616
config DRM_ANALOGIX_ANX78XX
1717
tristate "Analogix ANX78XX bridge"
18-
depends on DRM_DISPLAY_HELPER
1918
select DRM_ANALOGIX_DP
2019
select DRM_DISPLAY_DP_HELPER
20+
select DRM_DISPLAY_HELPER
2121
select DRM_KMS_HELPER
2222
select REGMAP_I2C
2323
help
@@ -33,10 +33,10 @@ config DRM_ANALOGIX_DP
3333
config DRM_ANALOGIX_ANX7625
3434
tristate "Analogix Anx7625 MIPI to DP interface support"
3535
depends on DRM
36-
depends on DRM_DISPLAY_HELPER
3736
depends on OF
3837
select DRM_DISPLAY_DP_HELPER
3938
select DRM_DISPLAY_HDCP_HELPER
39+
select DRM_DISPLAY_HELPER
4040
select DRM_DISPLAY_DP_AUX_BUS
4141
select DRM_MIPI_DSI
4242
help

‎drivers/gpu/drm/bridge/cadence/Kconfig‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ endif
2323

2424
config DRM_CDNS_MHDP8546
2525
tristate "Cadence DPI/DP bridge"
26-
depends on DRM_DISPLAY_HELPER
27-
depends on OF
2826
select DRM_DISPLAY_DP_HELPER
2927
select DRM_DISPLAY_HDCP_HELPER
28+
select DRM_DISPLAY_HELPER
3029
select DRM_KMS_HELPER
3130
select DRM_PANEL_BRIDGE
31+
depends on OF
3232
help
3333
Support Cadence DPI to DP bridge. This is an internal
3434
bridge and is meant to be directly embedded in a SoC.

‎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_HELPER
54
select DRM_DISPLAY_HDMI_HELPER
5+
select DRM_DISPLAY_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
@@ -3,7 +3,6 @@
33
config DRM_DISPLAY_HELPER
44
tristate "DRM Display Helpers"
55
depends on DRM
6-
default y
76
help
87
DRM helpers for display adapters.
98

‎drivers/gpu/drm/exynos/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ config DRM_EXYNOS
44
depends on OF && DRM && COMMON_CLK
55
depends on ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || COMPILE_TEST
66
depends on MMU
7+
select DRM_DISPLAY_HELPER if DRM_EXYNOS_DP
78
select DRM_KMS_HELPER
89
select VIDEOMODE_HELPERS
910
select FB_DMAMEM_HELPERS if DRM_FBDEV_EMULATION
@@ -67,7 +68,6 @@ config DRM_EXYNOS_DSI
6768
config DRM_EXYNOS_DP
6869
bool "Exynos specific extensions for Analogix DP driver"
6970
depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
70-
depends on DRM_DISPLAY_HELPER
7171
select DRM_ANALOGIX_DP
7272
select DRM_DISPLAY_DP_HELPER
7373
default DRM_EXYNOS

‎drivers/gpu/drm/i915/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
config DRM_I915
33
tristate "Intel 8xx/9xx/G3x/G4x/HD Graphics"
44
depends on DRM
5-
depends on DRM_DISPLAY_HELPER
65
depends on X86 && PCI
76
depends on !PREEMPT_RT
87
select INTEL_GTT if X86
@@ -14,6 +13,7 @@ config DRM_I915
1413
select DRM_DISPLAY_DP_HELPER
1514
select DRM_DISPLAY_HDCP_HELPER
1615
select DRM_DISPLAY_HDMI_HELPER
16+
select DRM_DISPLAY_HELPER
1717
select DRM_KMS_HELPER
1818
select DRM_PANEL
1919
select DRM_MIPI_DSI

‎drivers/gpu/drm/mediatek/Kconfig‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ config DRM_MEDIATEK
2222

2323
config DRM_MEDIATEK_DP
2424
tristate "DRM DPTX Support for MediaTek SoCs"
25-
depends on DRM_DISPLAY_HELPER
2625
depends on DRM_MEDIATEK
2726
select PHY_MTK_DP
27+
select DRM_DISPLAY_HELPER
2828
select DRM_DISPLAY_DP_HELPER
2929
select DRM_DISPLAY_DP_AUX_BUS
3030
help

0 commit comments

Comments
 (0)