Skip to content

Commit d674858

Browse files
committed
drm/display: Make all helpers visible and switch to depends on
All the helpers Kconfig symbols so far have relied on drivers selecting them, and that's what most drivers did. However, this creates an issue nowadays when helpers depend on each other, and select doesn't transitively select a dependency dependencies. Depends on doesn't have that limitation though, so let's convert those symbols to be dependable and use depends on between them too. Suggested-by: Jani Nikula <[email protected]> Reviewed-by: Jani Nikula <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent 35fd55c commit d674858

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

drivers/gpu/drm/display/Kconfig

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

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

99
config DRM_DISPLAY_DP_AUX_BUS
10-
tristate
10+
tristate "DRM DisplayPort AUX bus support"
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 && DRM_DISPLAY_HELPER
17-
select DRM_DISPLAY_DP_HELPER
16+
depends on DRM
17+
depends on DRM_DISPLAY_HELPER
18+
depends on DRM_DISPLAY_DP_HELPER
1819
select CEC_CORE
1920
help
2021
Choose this option if you want to enable HDMI CEC support for
@@ -24,23 +25,24 @@ config DRM_DISPLAY_DP_AUX_CEC
2425
that do support this they often do not hook up the CEC pin.
2526

2627
config DRM_DISPLAY_DP_AUX_CHARDEV
27-
bool "DRM DP AUX Interface"
28-
depends on DRM && DRM_DISPLAY_HELPER
29-
select DRM_DISPLAY_DP_HELPER
28+
bool "DRM DisplayPort AUX Interface"
29+
depends on DRM
30+
depends on DRM_DISPLAY_HELPER
31+
depends on DRM_DISPLAY_DP_HELPER
3032
help
3133
Choose this option to enable a /dev/drm_dp_auxN node that allows to
3234
read and write values to arbitrary DPCD registers on the DP aux
3335
channel.
3436

3537
config DRM_DISPLAY_DP_HELPER
36-
bool
38+
bool "DRM DisplayPort Helpers"
3739
depends on DRM_DISPLAY_HELPER
3840
help
3941
DRM display helpers for DisplayPort.
4042

4143
config DRM_DISPLAY_DP_TUNNEL
42-
bool
43-
select DRM_DISPLAY_DP_HELPER
44+
bool "DRM DisplayPort tunnels support"
45+
depends on DRM_DISPLAY_DP_HELPER
4446
help
4547
Enable support for DisplayPort tunnels. This allows drivers to use
4648
DP tunnel features like the Bandwidth Allocation mode to maximize the
@@ -60,13 +62,13 @@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
6062
If in doubt, say "N".
6163

6264
config DRM_DISPLAY_HDCP_HELPER
63-
bool
65+
bool "DRM HDCD Helpers"
6466
depends on DRM_DISPLAY_HELPER
6567
help
6668
DRM display helpers for HDCP.
6769

6870
config DRM_DISPLAY_HDMI_HELPER
69-
bool
71+
bool "DRM HDMI Helpers"
7072
depends on DRM_DISPLAY_HELPER
7173
help
7274
DRM display helpers for HDMI.

0 commit comments

Comments
 (0)