forge/linux-uconsole
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

media: rockchip: isp: clear isp force update bit

Browse source 
Change-Id: I6dd6b348638f24e8e441b3a0501a3b92e9fa70d5
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei 2024-08-02 09:11:18 +08:00 • committed by Tao Huang
commit e849bbadbe
3 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
drivers/media/platform/rockchip/isp/isp_params_v32.c
View file

@ -4977,8 +4977,10 @@ rkisp_params_first_cfg_v32(struct rkisp_isp_params_vdev *params_vdev)
isp3_param_write(params_vdev, addr + size * i, ISP32L_FRM_BUF_RD_BASE, i);
}
}
if (dev->hw_dev->is_single && (dev->isp_state & ISP_START))
if (dev->hw_dev->is_single && (dev->isp_state & ISP_START)) {
rkisp_set_bits(dev, ISP3X_ISP_CTRL0, 0, CIF_ISP_CTRL_ISP_CFG_UPD, true);
rkisp_clear_reg_cache_bits(dev, CIF_ISP_CTRL, CIF_ISP_CTRL_ISP_CFG_UPD);
}
}
static void rkisp_save_first_param_v32(struct rkisp_isp_params_vdev *params_vdev, void *param)

4
drivers/media/platform/rockchip/isp/isp_params_v39.c
View file

@ -4543,8 +4543,10 @@ rkisp_params_first_cfg_v39(struct rkisp_isp_params_vdev *params_vdev)
isp3_param_write(params_vdev, addr + size * i, ISP32L_FRM_BUF_RD_BASE, i);
}
}
if (dev->hw_dev->is_single && (dev->isp_state & ISP_START))
if (dev->hw_dev->is_single && (dev->isp_state & ISP_START)) {
rkisp_set_bits(dev, ISP3X_ISP_CTRL0, 0, CIF_ISP_CTRL_ISP_CFG_UPD, true);
rkisp_clear_reg_cache_bits(dev, ISP3X_ISP_CTRL0, CIF_ISP_CTRL_ISP_CFG_UPD);
}
}
static void rkisp_save_first_param_v39(struct rkisp_isp_params_vdev *params_vdev, void *param)

4
drivers/media/platform/rockchip/isp/rkisp.c
View file

@ -825,7 +825,9 @@ run_next:
if (is_upd) {
val = rkisp_read(dev, ISP_CTRL, false);
val |= CIF_ISP_CTRL_ISP_CFG_UPD;
rkisp_unite_write(dev, ISP_CTRL, val, true);
writel(val, hw->base_addr + ISP_CTRL);
if (hw->unite == ISP_UNITE_TWO)
writel(val, hw->base_next_addr + ISP_CTRL);
/* bayer pat after ISP_CFG_UPD for multi sensor to read lsc r/g/b table */
rkisp_update_regs(dev, ISP3X_ISP_CTRL1, ISP3X_ISP_CTRL1);
/* fix ldch multi sensor case: