Commit ce3887ed authored by Mark Yao's avatar Mark Yao

drm/rockchip: Optimization vop mode set

Rk3288 vop timing registers is immediately register, when configure
timing on display active time, will cause tearing. use dclk reset is
not a good idea to avoid this tearing. we can avoid tearing by using
standby register.

Vop standby register will take effect at end of current frame, and
go back to work immediately when exit standby.

So we can use standby register to protect this context.
Signed-off-by: default avatarMark Yao <mark.yao@rock-chips.com>
parent 63ebb9fa
...@@ -1097,10 +1097,40 @@ static void vop_crtc_enable(struct drm_crtc *crtc) ...@@ -1097,10 +1097,40 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
vop_enable(crtc); vop_enable(crtc);
/* /*
* disable dclk to stop frame scan, so that we can safe config mode and * If dclk rate is zero, mean that scanout is stop,
* enable iommu. * we don't need wait any more.
*/ */
clk_disable(vop->dclk); if (clk_get_rate(vop->dclk)) {
/*
* Rk3288 vop timing register is immediately, when configure
* display timing on display time, may cause tearing.
*
* Vop standby will take effect at end of current frame,
* if dsp hold valid irq happen, it means standby complete.
*
* mode set:
* standby and wait complete --> |----
* | display time
* |----
* |---> dsp hold irq
* configure display timing --> |
* standby exit |
* | new frame start.
*/
reinit_completion(&vop->dsp_hold_completion);
vop_dsp_hold_valid_irq_enable(vop);
spin_lock(&vop->reg_lock);
VOP_CTRL_SET(vop, standby, 1);
spin_unlock(&vop->reg_lock);
wait_for_completion(&vop->dsp_hold_completion);
vop_dsp_hold_valid_irq_disable(vop);
}
switch (vop->connector_type) { switch (vop->connector_type) {
case DRM_MODE_CONNECTOR_LVDS: case DRM_MODE_CONNECTOR_LVDS:
...@@ -1115,7 +1145,6 @@ static void vop_crtc_enable(struct drm_crtc *crtc) ...@@ -1115,7 +1145,6 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
default: default:
DRM_ERROR("unsupport connector_type[%d]\n", DRM_ERROR("unsupport connector_type[%d]\n",
vop->connector_type); vop->connector_type);
goto out;
}; };
VOP_CTRL_SET(vop, out_mode, vop->connector_out_mode); VOP_CTRL_SET(vop, out_mode, vop->connector_out_mode);
...@@ -1136,19 +1165,9 @@ static void vop_crtc_enable(struct drm_crtc *crtc) ...@@ -1136,19 +1165,9 @@ static void vop_crtc_enable(struct drm_crtc *crtc)
VOP_CTRL_SET(vop, vact_st_end, val); VOP_CTRL_SET(vop, vact_st_end, val);
VOP_CTRL_SET(vop, vpost_st_end, val); VOP_CTRL_SET(vop, vpost_st_end, val);
/*
* reset dclk, take all mode config affect, so the clk would run in
* correct frame.
*/
reset_control_assert(vop->dclk_rst);
usleep_range(10, 20);
reset_control_deassert(vop->dclk_rst);
clk_set_rate(vop->dclk, adjusted_mode->clock * 1000); clk_set_rate(vop->dclk, adjusted_mode->clock * 1000);
out:
if (clk_enable(vop->dclk) < 0) VOP_CTRL_SET(vop, standby, 0);
dev_err(vop->dev, "failed to enable dclk\n");
} }
static void vop_crtc_atomic_flush(struct drm_crtc *crtc, static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment