shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

media: rockchip: isp: fix bay3d if two readback for isp32

Browse Source 
if over resolution specification will need two readback,
first readback need to discard bay3d write data.

Change-Id: I940949109d18f54bde8ebe4650d2abebfe7b1ba8
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2024-11-27 17:41:55 +08:00
committed by Tao Huang
parent 8a5b96b0af
commit 501e98ac8a
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -558,6 +558,7 @@ static void rkisp_dvfs(struct rkisp_device *dev)
static void rkisp_multi_overflow_hdl(struct rkisp_device *dev, bool on)
{
struct rkisp_hw_dev *hw = dev->hw_dev;
u32 val;
if (on) {
/* enable mi */
@@ -571,6 +572,9 @@ static void rkisp_multi_overflow_hdl(struct rkisp_device *dev, bool on)
rkisp_update_regs(dev, ISP3X_MI_BP_WR_CTRL, ISP3X_MI_BP_WR_CTRL);
rkisp_update_regs(dev, ISP32_MI_BPDS_WR_CTRL, ISP32_MI_BPDS_WR_CTRL);
rkisp_update_regs(dev, ISP32_MI_MPDS_WR_CTRL, ISP32_MI_MPDS_WR_CTRL);
/* restore bay3d iir_wr and ds_wr */
rkisp_update_regs(dev, ISP3X_MI_BAY3D_IIR_WR_BASE, ISP3X_MI_BAY3D_IIR_WR_SIZE);
rkisp_update_regs(dev, ISP3X_MI_BAY3D_DS_WR_BASE, ISP3X_MI_BAY3D_DS_WR_SIZE);
}
} else {
/* disabled mi. rv1106 sdmmc workaround, 3a_wr no close */
@@ -590,6 +594,14 @@ static void rkisp_multi_overflow_hdl(struct rkisp_device *dev, bool on)
writel(0, hw->base_addr + ISP3X_MI_BP_WR_CTRL);
writel(0, hw->base_addr + ISP32_MI_BPDS_WR_CTRL);
writel(0, hw->base_addr + ISP32_MI_MPDS_WR_CTRL);
/* drop bay3d iir_wr and ds_wr data */
writel(4096, hw->base_addr + ISP3X_MI_BAY3D_IIR_WR_SIZE);
writel(4096, hw->base_addr + ISP3X_MI_BAY3D_DS_WR_SIZE);
val = readl(hw->base_addr + ISP3X_MI_3A_WR_BASE);
if (val) {
writel(val, hw->base_addr + ISP3X_MI_BAY3D_IIR_WR_BASE);
writel(val, hw->base_addr + ISP3X_MI_BAY3D_DS_WR_BASE);
}
}
}
rkisp_unite_write(dev, ISP3X_MI_WR_INIT, CIF_MI_INIT_SOFT_UPD, true);