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

media: rockchip: isp: fix lsc table read by isp for multi sensor

Browse Source 
Change-Id: Ic04c7521ee17806d74732aa852e9347411f92281
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2022-12-17 16:29:36 +08:00
committed by Tao Huang
parent fb022c61ad
commit 05374081e5
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/rockchip/isp/isp_params_v3x.c
View File

@@ -655,6 +655,8 @@ isp_lsc_config(struct rkisp_isp_params_vdev *params_vdev,
lsc_ctrl |= ISP3X_LSC_SECTOR_16X16;
else
lsc_ctrl &= ~ISP3X_LSC_SECTOR_16X16;
if (!dev->hw_dev->is_single)
lsc_ctrl |= ISP3X_LSC_PRE_RD_ST_MODE;
isp3_param_write(params_vdev, lsc_ctrl, ISP3X_LSC_CTRL, id);
}

1
drivers/media/platform/rockchip/isp/regs_v3x.h
View File

@@ -2139,6 +2139,7 @@
#define ISP3X_LSC_TABLE_ADDRESS_153 153
#define ISP3X_LSC_SECTOR_16X16 BIT(2)
#define ISP3X_LSC_PRE_RD_ST_MODE BIT(4)
/* RAWAE */
#define ISP3X_RAWAE_LITE_EN BIT(0)

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

@@ -615,7 +615,7 @@ void rkisp_trigger_read_back(struct rkisp_device *dev, u8 dma2frm, u32 mode, boo
if (!hw->is_single && !is_try) {
rkisp_update_regs(dev, CTRL_VI_ISP_PATH, SUPER_IMP_COLOR_CR);
rkisp_update_regs(dev, DUAL_CROP_M_H_OFFS, ISP3X_DUAL_CROP_FBC_V_SIZE);
rkisp_update_regs(dev, ISP_ACQ_PROP, DUAL_CROP_CTRL);
rkisp_update_regs(dev, ISP_ACQ_H_OFFS, DUAL_CROP_CTRL);
rkisp_update_regs(dev, SELF_RESIZE_SCALE_HY, MI_WR_CTRL);
rkisp_update_regs(dev, ISP32_BP_RESIZE_SCALE_HY, SELF_RESIZE_CTRL);
rkisp_update_regs(dev, MAIN_RESIZE_SCALE_HY, ISP32_BP_RESIZE_CTRL);
@@ -693,6 +693,8 @@ run_next:
val = rkisp_read(dev, ISP_CTRL, false);
val |= CIF_ISP_CTRL_ISP_CFG_UPD;
rkisp_unite_write(dev, ISP_CTRL, val, true, hw->is_unite);
/* bayer pat after ISP_CFG_UPD for multi sensor to read lsc r/g/b table */
rkisp_update_regs(dev, ISP_ACQ_PROP, ISP_ACQ_PROP);
}
if (is_3dlut_upd)
rkisp_unite_write(dev, ISP_3DLUT_UPDATE, 1, true, hw->is_unite);