diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
index f75e02570e4e..959417b9c8ce 100644
--- a/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
+++ b/drivers/gpu/drm/rockchip/rockchip_drm_vop.c
@@ -862,7 +862,8 @@ static void vop_crtc_disable(struct drm_crtc *crtc)
 
 	spin_unlock(&vop->reg_lock);
 
-	wait_for_completion(&vop->dsp_hold_completion);
+	WARN_ON(!wait_for_completion_timeout(&vop->dsp_hold_completion,
+					     msecs_to_jiffies(50)));
 
 	vop_dsp_hold_valid_irq_disable(vop);
 
@@ -1463,7 +1464,8 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
 
 		spin_unlock(&vop->reg_lock);
 
-		wait_for_completion(&vop->dsp_hold_completion);
+		WARN_ON(!wait_for_completion_timeout(&vop->dsp_hold_completion,
+						     msecs_to_jiffies(50)));
 
 		vop_dsp_hold_valid_irq_disable(vop);
 	}