github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/rockchip: vop: after create 1:1 mapping no need to wait vblank

Browse Source 
after create 1:1 mapping, we can enable iommu at any time, because
whether the iommu is enable or not, the VOP can access the correct
phy addr.

dma_addr----->iommu module---->phy addr
        |			|
        |---------bypass--------|

Change-Id: I50f6a897d90c33e5bd0fba099654ce788d3d647d
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang 2020-06-02 17:11:46 +08:00 committed by Tao Huang
parent f831f246a0
commit c10f1e9c02
1 changed files with 0 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
drivers/gpu/drm/rockchip/rockchip_drm_vop.c
View File

@ -537,19 +537,6 @@ static void vop_disable_allwin(struct vop *vop)
}
}
static bool vop_fs_irq_is_active(struct vop *vop)
{
if (VOP_MAJOR(vop->version) == 3 && VOP_MINOR(vop->version) >= 7)
return VOP_INTR_GET_TYPE(vop, status, FS_FIELD_INTR);
else
return VOP_INTR_GET_TYPE(vop, status, FS_INTR);
}
static bool vop_line_flag_is_active(struct vop *vop)
{
return VOP_INTR_GET_TYPE(vop, status, LINE_FLAG_INTR);
}
static inline void vop_write_lut(struct vop *vop, uint32_t offset, uint32_t v)
{
writel(v, vop->lut_regs + offset);
@ -3564,41 +3551,11 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
vop_cfg_update(crtc, old_crtc_state);
if (!vop->is_iommu_enabled && vop->is_iommu_needed) {
bool need_wait_vblank = false;
int ret;
if (s->mode_update)
VOP_CTRL_SET(vop, dma_stop, 1);
need_wait_vblank = !vop_is_allwin_disabled(vop);
if (s->mode_update && need_wait_vblank)
dev_warn(vop->dev, "mode_update:%d, need wait blk:%d\n",
s->mode_update, need_wait_vblank);
if (need_wait_vblank) {
bool active;
disable_irq(vop->irq);
drm_crtc_vblank_get(crtc);
VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 1);
ret = readx_poll_timeout_atomic(vop_fs_irq_is_active,
vop, active, active,
0, 50 * 1000);
if (ret)
dev_err(vop->dev, "wait fs irq timeout\n");
VOP_INTR_SET_TYPE(vop, clear, LINE_FLAG_INTR, 1);
vop_cfg_done(vop);
ret = readx_poll_timeout_atomic(vop_line_flag_is_active,
vop, active, active,
0, 50 * 1000);
if (ret)
dev_err(vop->dev, "wait line flag timeout\n");
enable_irq(vop->irq);
}
ret = rockchip_drm_dma_attach_device(vop->drm_dev, vop->dev);
if (ret) {
vop->is_iommu_enabled = false;
@ -3609,11 +3566,6 @@ static void vop_crtc_atomic_flush(struct drm_crtc *crtc,
vop->is_iommu_enabled = true;
VOP_CTRL_SET(vop, dma_stop, 0);
}
if (need_wait_vblank) {
VOP_INTR_SET_TYPE(vop, enable, LINE_FLAG_INTR, 0);
drm_crtc_vblank_put(crtc);
}
}
vop_update_hdr(crtc, old_crtc_state);