Skip to content

Commit edc4e85

Browse files
geertumripard
authored andcommitted
Revert "drm/display: Make all helpers visible and switch to depends on"
This reverts commit d674858, 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/3db958e3f4002e26cd963596d810c37feb315fb3.1713780345.git.geert+renesas@glider.be Signed-off-by: Maxime Ripard <[email protected]>
1 parent 8f7f115 commit edc4e85

File tree

1 file changed

+12
-14
lines changed

1 file changed

+12
-14
lines changed

drivers/gpu/drm/display/Kconfig

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,20 @@
11
# SPDX-License-Identifier: MIT
22

33
config DRM_DISPLAY_HELPER
4-
tristate "DRM Display Helpers"
4+
tristate
55
depends on DRM
66
help
77
DRM helpers for display adapters.
88

99
config DRM_DISPLAY_DP_AUX_BUS
10-
tristate "DRM DisplayPort AUX bus support"
10+
tristate
1111
depends on DRM
1212
depends on OF || COMPILE_TEST
1313

1414
config DRM_DISPLAY_DP_AUX_CEC
1515
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
16-
depends on DRM
17-
depends on DRM_DISPLAY_HELPER
18-
depends on DRM_DISPLAY_DP_HELPER
16+
depends on DRM && DRM_DISPLAY_HELPER
17+
select DRM_DISPLAY_DP_HELPER
1918
select CEC_CORE
2019
help
2120
Choose this option if you want to enable HDMI CEC support for
@@ -25,24 +24,23 @@ config DRM_DISPLAY_DP_AUX_CEC
2524
that do support this they often do not hook up the CEC pin.
2625

2726
config DRM_DISPLAY_DP_AUX_CHARDEV
28-
bool "DRM DisplayPort AUX Interface"
29-
depends on DRM
30-
depends on DRM_DISPLAY_HELPER
31-
depends on DRM_DISPLAY_DP_HELPER
27+
bool "DRM DP AUX Interface"
28+
depends on DRM && DRM_DISPLAY_HELPER
29+
select DRM_DISPLAY_DP_HELPER
3230
help
3331
Choose this option to enable a /dev/drm_dp_auxN node that allows to
3432
read and write values to arbitrary DPCD registers on the DP aux
3533
channel.
3634

3735
config DRM_DISPLAY_DP_HELPER
38-
bool "DRM DisplayPort Helpers"
36+
bool
3937
depends on DRM_DISPLAY_HELPER
4038
help
4139
DRM display helpers for DisplayPort.
4240

4341
config DRM_DISPLAY_DP_TUNNEL
44-
bool "DRM DisplayPort tunnels support"
45-
depends on DRM_DISPLAY_DP_HELPER
42+
bool
43+
select DRM_DISPLAY_DP_HELPER
4644
help
4745
Enable support for DisplayPort tunnels. This allows drivers to use
4846
DP tunnel features like the Bandwidth Allocation mode to maximize the
@@ -62,13 +60,13 @@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
6260
If in doubt, say "N".
6361

6462
config DRM_DISPLAY_HDCP_HELPER
65-
bool "DRM HDCD Helpers"
63+
bool
6664
depends on DRM_DISPLAY_HELPER
6765
help
6866
DRM display helpers for HDCP.
6967

7068
config DRM_DISPLAY_HDMI_HELPER
71-
bool "DRM HDMI Helpers"
69+
bool
7270
depends on DRM_DISPLAY_HELPER
7371
help
7472
DRM display helpers for HDMI.

0 commit comments

Comments
 (0)