[PULL] drm-misc-next

[Maarten Lankhorst]

Op 01-02-2022 om 07:38 schreef Dave Airlie:
> On Thu, 27 Jan 2022 at 21:57, Maarten Lankhorst
> <maarten.lankhorst at linux.intel.com> wrote:
>> Hi Dave & Daniel,
>>
>> First pull for v5.18
> I was trying to be all efficient and get this pulled in time for once.
>
>
> However it broke building on my arm test build.
>
> The new DP helper Kconfig is wrong somewhere.
>
> I've attached the .config, but it appears I get DRM_DP_HELPER set to M
> but ANALOGIX_DP set to Y and it fails to link because the dp helper
> should be Y.
>
> Regards,
> Dave.
Below should likely fix it?

diff --git a/drivers/gpu/drm/exynos/Kconfig b/drivers/gpu/drm/exynos/Kconfig
index 6a251e3aa779..f27cfd2a9726 100644
--- a/drivers/gpu/drm/exynos/Kconfig
+++ b/drivers/gpu/drm/exynos/Kconfig
@@ -66,6 +66,7 @@ config DRM_EXYNOS_DP
 	bool "Exynos specific extensions for Analogix DP driver"
 	depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
 	select DRM_ANALOGIX_DP
+	select DRM_DP_HELPER
 	default DRM_EXYNOS
 	select DRM_PANEL
 	help
diff --git a/drivers/gpu/drm/rockchip/Kconfig b/drivers/gpu/drm/rockchip/Kconfig
index d59dca5efb52..fa5cfda4e90e 100644
--- a/drivers/gpu/drm/rockchip/Kconfig
+++ b/drivers/gpu/drm/rockchip/Kconfig
@@ -8,6 +8,7 @@ config DRM_ROCKCHIP
 	select DRM_PANEL
 	select VIDEOMODE_HELPERS
 	select DRM_ANALOGIX_DP if ROCKCHIP_ANALOGIX_DP
+	select DRM_DP_HELPER if ROCKCHIP_ANALOGIX_DP
 	select DRM_DW_HDMI if ROCKCHIP_DW_HDMI
 	select DRM_DW_MIPI_DSI if ROCKCHIP_DW_MIPI_DSI
 	select GENERIC_PHY if ROCKCHIP_DW_MIPI_DSI