shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-07 11:26:02 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix output stream sync for readback mode

Browse Source 
Change-Id: I189c64139a2ebf44f3e0c5f091fd4bc776e2047c
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-12-26 19:30:52 +08:00
committed by Tao Huang
parent 973a5a0522
commit 2e8cb1629d
1 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/media/platform/rockchip/isp/rkisp.c
View File

@@ -653,6 +653,22 @@ void rkisp_trigger_read_back(struct rkisp_device *dev, u8 dma2frm, u32 mode, boo
dev->multi_mode, dev->multi_index, val);
}
is_upd = true;
/* if output stream enable, wait it end */
val = rkisp_read(dev, CIF_MI_CTRL_SHD, true);
if (val & CIF_MI_CTRL_SHD_MP_OUT_ENABLED &&
!(dev->irq_ends_mask & ISP_FRAME_MP))
dev->irq_ends_mask |= ISP_FRAME_MP;
if (val & CIF_MI_CTRL_SHD_SP_OUT_ENABLED &&
!(dev->irq_ends_mask & ISP_FRAME_SP))
dev->irq_ends_mask |= ISP_FRAME_SP;
if (dev->isp_ver == ISP_V30 &&
!(dev->irq_ends_mask & ISP_FRAME_MPFBC) &&
rkisp_read(dev, ISP3X_MPFBC_CTRL, true) & ISP3X_MPFBC_EN_SHD)
dev->irq_ends_mask |= ISP_FRAME_MPFBC;
if (dev->isp_ver == ISP_V32 &&
!(dev->irq_ends_mask & ISP_FRAME_BP) &&
rkisp_read(dev, ISP32_MI_WR_CTRL2_SHD, true) & ISP32_BP_EN_OUT_SHD)
dev->irq_ends_mask |= ISP_FRAME_BP;
}
if (dev->isp_ver == ISP_V21 ||