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 isp39 params

Browse Source 
Change-Id: Ia9e0e79964072464f068e426f2cfaef30d2414ed
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
This commit is contained in:
Cai YiWei
2024-06-11 18:51:53 +08:00
committed by Tao Huang
parent 37a90dcc03
commit df4d3676e7
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2214,11 +2214,11 @@ isp_hdrdrc_config(struct rkisp_isp_params_vdev *params_vdev,
(arg->lpdetail_ratio & 0xFFF);
isp3_param_write(params_vdev, value, ISP3X_DRC_LPRATIO, id);
value = arg->weicur_pix << 24 | !!arg->thumb_thd_enable |
value = arg->weicur_pix << 24 | !!arg->thumb_thd_enable << 23 |
(arg->thumb_thd_neg & 0x1ff) << 8 | arg->bilat_wt_off;
isp3_param_write(params_vdev, value, ISP39_DRC_BILAT0, id);
value = (arg->drc_gas_t & 0x3ff) << 16 | !!arg->cmps_fixbit_mode |
value = (arg->drc_gas_t & 0x3ff) << 16 | !!arg->cmps_fixbit_mode << 4 |
(arg->cmps_offset_bits_int & 0xf);
isp3_param_write(params_vdev, value, ISP39_DRC_BILAT1, id);
@@ -3332,7 +3332,7 @@ isp_bay3d_config(struct rkisp_isp_params_vdev *params_vdev,
isp3_param_write(params_vdev, value, ISP39_BAY3D_TNRKEEP, id);
value = (arg->tnr_pix_max & 0xfff) | (arg->lowgt_ctrl & 0x3) << 16 |
(arg->lowgt_offint & 0x3ff) << 18;
(arg->lowgt_offint & 0x3ff) << 18;
isp3_param_write(params_vdev, value, ISP39_BAY3D_PIXMAX, id);
value = arg->tnr_auto_sigma_count_th;

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

@@ -837,9 +837,11 @@ static void isp39_show(struct rkisp_device *dev, struct seq_file *p)
u32 val, val1, val2;
val = rkisp_read(dev, ISP3X_GIC_CONTROL, false);
seq_printf(p, "%-10s %s(0x%x)\n", "GIC", (val & 1) ? "ON" : "OFF", val);
seq_printf(p, "%-10s %s(0x%x) bypass:%d\n", "GIC", (val & (BIT(0) | BIT(31))) ? "ON" : "OFF",
val, (val == BIT(31)) ? 1 : !!(val & BIT(1)));
val = rkisp_read(dev, ISP3X_CAC_CTRL, false);
seq_printf(p, "%-10s %s(0x%x)\n", "CAC", (val & 1) ? "ON" : "OFF", val);
seq_printf(p, "%-10s %s(0x%x) bypass:%d\n", "CAC", (val & (BIT(0) | BIT(31))) ? "ON" : "OFF",
val, !!(val & (BIT(1) | BIT(30))));
val = rkisp_read(dev, ISP3X_ISP_CTRL0, false);
seq_printf(p, "%-10s %s(0x%x)\n", "SDG", (val & BIT(6)) ? "ON" : "OFF", val);
seq_printf(p, "%-10s %s(0x%x) (gain0:0x%08x 0x%08x gain1:0x%x 0x%x)\n", "AWBGAIN",
@@ -868,7 +870,8 @@ static void isp39_show(struct rkisp_device *dev, struct seq_file *p)
seq_printf(p, "%-10s %s(0x%x) (effect: %s)\n", "IE", (val & 1) ? "ON" : "OFF",
val, effect[!!val]);
val = rkisp_read(dev, ISP3X_DRC_CTRL0, false);
seq_printf(p, "%-10s %s(0x%x)\n", "HDRDRC", (val & 1) ? "ON" : "OFF", val);
seq_printf(p, "%-10s %s(0x%x) bypass:%d\n", "HDRDRC", (val & 1) ? "ON" : "OFF",
val, !!(val & BIT(1)));
val = rkisp_read(dev, ISP3X_HDRMGE_CTRL, false);
seq_printf(p, "%-10s %s(0x%x)\n", "HDRMGE", (val & 1) ? "ON" : "OFF", val);
val = rkisp_read(dev, ISP3X_DHAZ_CTRL, false);