diff --git a/drivers/media/platform/rockchip/isp/isp_params_v39.c b/drivers/media/platform/rockchip/isp/isp_params_v39.c index 909bd8ef975a..94bab9086789 100644 --- a/drivers/media/platform/rockchip/isp/isp_params_v39.c +++ b/drivers/media/platform/rockchip/isp/isp_params_v39.c @@ -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; diff --git a/drivers/media/platform/rockchip/isp/procfs.c b/drivers/media/platform/rockchip/isp/procfs.c index 9818f9b59e87..d0a08a0e495c 100644 --- a/drivers/media/platform/rockchip/isp/procfs.c +++ b/drivers/media/platform/rockchip/isp/procfs.c @@ -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);