Skip to content

Commit 466cb3c

Browse files
lumagmripard
authored andcommitted
drm/display: stop depending on DRM_DISPLAY_HELPER
Kconfig symbols should not declare dependency on DRM_DISPLAY_HELPER. Move all parts of DRM_DISPLAY_HELPER to an if DRM_DISPLAY_HELPER block. It is not possible to make those symbols select DRM_DISPLAY_HELPER because of the link issues when a part of the helper is selected to be built-in, while other part is selected to be as module. In such a case the modular part doesn't get built at all, leading to undefined symbols. The only viable alternative is to split drm_display_helper.ko into several small modules, each of them having their own dependencies. Suggested-by: Maxime Ripard <[email protected]> Signed-off-by: Dmitry Baryshkov <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/20240903-drm-bridge-connector-fix-hdmi-reset-v5-1-daebde6d9857@linaro.org Signed-off-by: Maxime Ripard <[email protected]>
1 parent 3f6b2f6 commit 466cb3c

File tree

1 file changed

+8
-10
lines changed

1 file changed

+8
-10
lines changed

drivers/gpu/drm/display/Kconfig

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

3+
config DRM_DISPLAY_DP_AUX_BUS
4+
tristate
5+
depends on DRM
6+
depends on OF || COMPILE_TEST
7+
38
config DRM_DISPLAY_HELPER
49
tristate
510
depends on DRM
611
help
712
DRM helpers for display adapters.
813

9-
config DRM_DISPLAY_DP_AUX_BUS
10-
tristate
11-
depends on DRM
12-
depends on OF || COMPILE_TEST
14+
if DRM_DISPLAY_HELPER
1315

1416
config DRM_DISPLAY_DP_AUX_CEC
1517
bool "Enable DisplayPort CEC-Tunneling-over-AUX HDMI support"
16-
depends on DRM && DRM_DISPLAY_HELPER
1718
select DRM_DISPLAY_DP_HELPER
1819
select CEC_CORE
1920
help
@@ -25,7 +26,6 @@ config DRM_DISPLAY_DP_AUX_CEC
2526

2627
config DRM_DISPLAY_DP_AUX_CHARDEV
2728
bool "DRM DP AUX Interface"
28-
depends on DRM && DRM_DISPLAY_HELPER
2929
select DRM_DISPLAY_DP_HELPER
3030
help
3131
Choose this option to enable a /dev/drm_dp_auxN node that allows to
@@ -34,7 +34,6 @@ config DRM_DISPLAY_DP_AUX_CHARDEV
3434

3535
config DRM_DISPLAY_DP_HELPER
3636
bool
37-
depends on DRM_DISPLAY_HELPER
3837
help
3938
DRM display helpers for DisplayPort.
4039

@@ -61,19 +60,18 @@ config DRM_DISPLAY_DP_TUNNEL_STATE_DEBUG
6160

6261
config DRM_DISPLAY_HDCP_HELPER
6362
bool
64-
depends on DRM_DISPLAY_HELPER
6563
help
6664
DRM display helpers for HDCP.
6765

6866
config DRM_DISPLAY_HDMI_HELPER
6967
bool
70-
depends on DRM_DISPLAY_HELPER
7168
help
7269
DRM display helpers for HDMI.
7370

7471
config DRM_DISPLAY_HDMI_STATE_HELPER
7572
bool
76-
depends on DRM_DISPLAY_HELPER
7773
select DRM_DISPLAY_HDMI_HELPER
7874
help
7975
DRM KMS state helpers for HDMI.
76+
77+
endif # DRM_DISPLAY_HELPER

0 commit comments

Comments
 (0)