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

media: rockchip: isp: fix hdrmge config error for isp30 read back mode

Browse Source 
Change-Id: I2cb228cf507c9d5fd1246add1ab625f200c72f20
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2021-12-10 15:21:16 +08:00
committed by Tao Huang
parent e321a068b4
commit a1c6f01928
3 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2548,11 +2548,12 @@ isp_hdrmge_config(struct rkisp_isp_params_vdev *params_vdev,
value = arg->gain2;
isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN2, id);
if (arg->s_base) {
value = isp3_param_read_cache(params_vdev, ISP3X_HDRMGE_CTRL, id);
value = isp3_param_read_cache(params_vdev, ISP3X_HDRMGE_CTRL, id);
if (arg->s_base)
value |= BIT(1);
isp3_param_write(params_vdev, value, ISP3X_HDRMGE_CTRL, id);
}
else
value &= ~BIT(1);
isp3_param_write(params_vdev, value, ISP3X_HDRMGE_CTRL, id);
}
if (type == RKISP_PARAMS_IMD || type == RKISP_PARAMS_ALL) {

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

@@ -2492,6 +2492,7 @@
/* HDRMGE */
/* ISP_HDRMGE_CTRL */
#define ISP_HDRMGE_MODE_MASK GENMASK(3, 2)
#define ISP_HDRMGE_EN BIT(0)
/* RAWNR */

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

@@ -527,9 +527,9 @@ void rkisp_trigger_read_back(struct rkisp_device *dev, u8 dma2frm, u32 mode, boo
}
}
tmp = rkisp_read(dev, ISP_HDRMGE_BASE, false) & 0xf;
if (val != tmp) {
rkisp_unite_write(dev, ISP_HDRMGE_BASE, val, false, hw->is_unite);
if (rd_mode != dev->rd_mode) {
rkisp_unite_set_bits(dev, ISP_HDRMGE_BASE, ISP_HDRMGE_MODE_MASK,
val, false, hw->is_unite);
dev->skip_frame = 2;
is_upd = true;
}