Skip to content

Commit

Permalink
drm/rockchip: vop: set vop enabled after enable iommu
Browse files Browse the repository at this point in the history
there is a Bug that:
  vop_enable()->drm_vblank_on, drm_vblank_on may call vop
enable vblank. if it happen, vblank enable would failed,
then cause irq status error. because is_enabled value is set
after drm_vblank_on.

after enable vop clocks and iommu regs, we can sure that
R/W vop regs and do vop plane flip is safe, so place
is_enabled = true after enable iommu is suitable.

Signed-off-by: Mark Yao <mark.yao@rock-chips.com>
  • Loading branch information
Mark Yao committed Mar 16, 2015
1 parent 31e980c commit 52ab789
Showing 1 changed file with 7 additions and 4 deletions.
11 changes: 7 additions & 4 deletions drivers/gpu/drm/rockchip/rockchip_drm_vop.c
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,11 @@ static void vop_enable(struct drm_crtc *crtc)
goto err_disable_aclk;
}

/*
* At here, vop clock & iommu is enable, R/W vop regs would be safe.
*/
vop->is_enabled = true;

spin_lock(&vop->reg_lock);

VOP_CTRL_SET(vop, standby, 0);
Expand All @@ -430,8 +435,6 @@ static void vop_enable(struct drm_crtc *crtc)

drm_vblank_on(vop->drm_dev, vop->pipe);

vop->is_enabled = true;

return;

err_disable_aclk:
Expand Down Expand Up @@ -462,6 +465,8 @@ static void vop_disable(struct drm_crtc *crtc)
VOP_CTRL_SET(vop, standby, 1);

spin_unlock(&vop->reg_lock);

vop->is_enabled = false;
/*
* disable dclk to stop frame scan, so we can safely detach iommu,
*/
Expand All @@ -471,8 +476,6 @@ static void vop_disable(struct drm_crtc *crtc)

clk_disable(vop->aclk);
clk_disable(vop->hclk);

vop->is_enabled = false;
}

/*
Expand Down

0 comments on commit 52ab789

Please sign in to comment.