Skip to content

Commit d1ef8fc

Browse files
arndbmripard
authored andcommitted
drm: fix DRM_DISPLAY_DP_HELPER dependencies
Both the exynos and rockchip drivers ran into link failures after a Kconfig cleanup: aarch64-linux-ld: drivers/gpu/drm/exynos/exynos_dp.o: in function `exynos_dp_resume': exynos_dp.c:(.text+0xc0): undefined reference to `analogix_dp_resume' aarch64-linux-ld: drivers/gpu/drm/exynos/exynos_dp.o: in function `exynos_dp_suspend': exynos_dp.c:(.text+0xf4): undefined reference to `analogix_dp_suspend' x86_64-linux-ld: drivers/gpu/drm/rockchip/cdn-dp-core.o: in function `cdn_dp_connector_mode_valid': cdn-dp-core.c:(.text+0x13a): undefined reference to `drm_dp_bw_code_to_link_rate' x86_64-linux-ld: cdn-dp-core.c:(.text+0x148): undefined reference to `drm_dp_bw_code_to_link_rate' x86_64-linux-ld: drivers/gpu/drm/rockchip/cdn-dp-core.o: in function `cdn_dp_check_link_status': cdn-dp-core.c:(.text+0x1396): undefined reference to `drm_dp_channel_eq_ok' In both cases, the problem is that ROCKCHIP_CDN_DP and DRM_EXYNOS_DP are 'bool' symbols that depend on the the 'tristate' DRM_DISPLAY_HELPER symbol, but end up not working when the SoC specific part is built-in but the helper is in a loadable module. Use the same trick that DRM_ROCKCHIP already uses for the EXTCON dependency and disallow DP support when it would not work. Fixes: 0323287 ("drm: Switch DRM_DISPLAY_DP_HELPER to depends on") Signed-off-by: Arnd Bergmann <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected] Signed-off-by: Maxime Ripard <[email protected]>
1 parent f3d9683 commit d1ef8fc

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

drivers/gpu/drm/exynos/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ config DRM_EXYNOS_DP
6868
bool "Exynos specific extensions for Analogix DP driver"
6969
depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
7070
depends on DRM_DISPLAY_DP_HELPER
71-
depends on DRM_DISPLAY_HELPER
71+
depends on DRM_DISPLAY_HELPER=y || (DRM_DISPLAY_HELPER=m && DRM_EXYNOS=m)
7272
select DRM_ANALOGIX_DP
7373
default DRM_EXYNOS
7474
select DRM_PANEL

drivers/gpu/drm/rockchip/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ config ROCKCHIP_ANALOGIX_DP
4646
config ROCKCHIP_CDN_DP
4747
bool "Rockchip cdn DP"
4848
depends on DRM_DISPLAY_DP_HELPER
49-
depends on DRM_DISPLAY_HELPER
49+
depends on DRM_DISPLAY_HELPER=y || (DRM_DISPLAY_HELPER=m && DRM_ROCKCHIP=m)
5050
depends on EXTCON=y || (EXTCON=m && DRM_ROCKCHIP=m)
5151
help
5252
This selects support for Rockchip SoC specific extensions

0 commit comments

Comments
 (0)