From b9cf037fcfe5bf72aa2dc8154a20c06a1d626cac Mon Sep 17 00:00:00 2001 From: Zhang Yubing Date: Fri, 1 Mar 2024 10:42:24 +0800 Subject: [PATCH] drm/rockchip: drv: wait dp mst dependent commit Change-Id: Ib4638471993bba742f8cdb18662e06e6088ec07c Signed-off-by: Zhang Yubing --- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c index 2bb60b8f25ae..b5dac5749106 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_fb.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_fb.c @@ -251,6 +251,10 @@ static void rockchip_drm_atomic_helper_commit_tail_rpm(struct drm_atomic_state * struct rockchip_drm_private *prv = dev->dev_private; struct dmcfreq_vop_info vop_bw_info; +#ifdef CONFIG_DRM_DISPLAY_DP_HELPER + drm_dp_mst_atomic_wait_for_dependencies(old_state); +#endif + drm_atomic_helper_commit_modeset_disables(dev, old_state); drm_atomic_helper_commit_modeset_enables(dev, old_state); @@ -278,6 +282,9 @@ static void rockchip_drm_atomic_helper_commit_tail_rpm(struct drm_atomic_state * static const struct drm_mode_config_helper_funcs rockchip_mode_config_helpers = { .atomic_commit_tail = rockchip_drm_atomic_helper_commit_tail_rpm, +#ifdef CONFIG_DRM_DISPLAY_DP_HELPER + .atomic_commit_setup = drm_dp_mst_atomic_setup_commit, +#endif }; static struct drm_framebuffer *