From d46f81d42d19bf298fd608db3b46467fe4e6f755 Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Wed, 21 Dec 2022 11:34:22 +0800 Subject: [PATCH] media: rockchip: isp: fix 3a to ddr iommu err for isp30 two readback mode Change-Id: I7b8911930cae4fce99b9f36fbf0d807bb55e5c07 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/rkisp.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/media/platform/rockchip/isp/rkisp.c b/drivers/media/platform/rockchip/isp/rkisp.c index a168fc0e2a5c..a981d68c507c 100644 --- a/drivers/media/platform/rockchip/isp/rkisp.c +++ b/drivers/media/platform/rockchip/isp/rkisp.c @@ -502,6 +502,7 @@ static void rkisp_multi_overflow_hdl(struct rkisp_device *dev, bool on) rkisp_update_regs(dev, ISP3X_MPFBC_CTRL, ISP3X_MPFBC_CTRL); rkisp_update_regs(dev, ISP3X_MI_BP_WR_CTRL, ISP3X_MI_BP_WR_CTRL); rkisp_update_regs(dev, ISP3X_BAY3D_CTRL, ISP3X_BAY3D_CTRL); + rkisp_update_regs(dev, ISP3X_SWS_CFG, ISP3X_SWS_CFG); } else if (dev->isp_ver == ISP_V32) { 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); @@ -517,11 +518,13 @@ static void rkisp_multi_overflow_hdl(struct rkisp_device *dev, bool on) writel(0, hw->base_addr + ISP3X_MPFBC_CTRL); writel(0, hw->base_addr + ISP3X_MI_BP_WR_CTRL); writel(0, hw->base_addr + ISP3X_BAY3D_CTRL); + writel(0xc, hw->base_addr + ISP3X_SWS_CFG); if (hw->is_unite) { writel(0, hw->base_next_addr + ISP3X_MI_WR_CTRL); writel(0, hw->base_next_addr + ISP3X_MPFBC_CTRL); writel(0, hw->base_next_addr + ISP3X_MI_BP_WR_CTRL); writel(0, hw->base_next_addr + ISP3X_BAY3D_CTRL); + writel(0xc, hw->base_next_addr + ISP3X_SWS_CFG); } } else if (dev->isp_ver == ISP_V32) { writel(0, hw->base_addr + ISP3X_MI_BP_WR_CTRL);