From 6778948f9de86c3cfaf36725a7c87dcff9ba247f Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Mon, 11 Dec 2023 08:20:59 +0000
Subject: [PATCH] kernel_5.10 no rt
---
kernel/drivers/media/platform/rockchip/isp/isp_params_v32.c | 2368 +++++++++++++++++++++++++++++++---------------------------
1 files changed, 1,259 insertions(+), 1,109 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/isp_params_v32.c b/kernel/drivers/media/platform/rockchip/isp/isp_params_v32.c
index 7326ee3..4343412 100644
--- a/kernel/drivers/media/platform/rockchip/isp/isp_params_v32.c
+++ b/kernel/drivers/media/platform/rockchip/isp/isp_params_v32.c
@@ -47,9 +47,12 @@
static inline void
isp3_param_write(struct rkisp_isp_params_vdev *params_vdev,
- u32 value, u32 addr)
+ u32 value, u32 addr, u32 id)
{
- rkisp_write(params_vdev->dev, addr, value, false);
+ if (id == ISP3_LEFT)
+ rkisp_write(params_vdev->dev, addr, value, false);
+ else
+ rkisp_next_write(params_vdev->dev, addr, value, false);
}
static inline u32
@@ -59,45 +62,63 @@
}
static inline u32
-isp3_param_read(struct rkisp_isp_params_vdev *params_vdev, u32 addr)
+isp3_param_read(struct rkisp_isp_params_vdev *params_vdev, u32 addr, u32 id)
{
- return rkisp_read(params_vdev->dev, addr, false);
+ u32 val;
+
+ if (id == ISP3_LEFT)
+ val = rkisp_read(params_vdev->dev, addr, false);
+ else
+ val = rkisp_next_read(params_vdev->dev, addr, false);
+ return val;
}
static inline u32
-isp3_param_read_cache(struct rkisp_isp_params_vdev *params_vdev, u32 addr)
+isp3_param_read_cache(struct rkisp_isp_params_vdev *params_vdev, u32 addr, u32 id)
{
- return rkisp_read_reg_cache(params_vdev->dev, addr);
+ u32 val;
+
+ if (id == ISP3_LEFT)
+ val = rkisp_read_reg_cache(params_vdev->dev, addr);
+ else
+ val = rkisp_next_read_reg_cache(params_vdev->dev, addr);
+ return val;
}
static inline void
isp3_param_set_bits(struct rkisp_isp_params_vdev *params_vdev,
- u32 reg, u32 bit_mask)
+ u32 reg, u32 bit_mask, u32 id)
{
- rkisp_set_bits(params_vdev->dev, reg, 0, bit_mask, false);
+ if (id == ISP3_LEFT)
+ rkisp_set_bits(params_vdev->dev, reg, 0, bit_mask, false);
+ else
+ rkisp_next_set_bits(params_vdev->dev, reg, 0, bit_mask, false);
}
static inline void
isp3_param_clear_bits(struct rkisp_isp_params_vdev *params_vdev,
- u32 reg, u32 bit_mask)
+ u32 reg, u32 bit_mask, u32 id)
{
- rkisp_clear_bits(params_vdev->dev, reg, bit_mask, false);
+ if (id == ISP3_LEFT)
+ rkisp_clear_bits(params_vdev->dev, reg, bit_mask, false);
+ else
+ rkisp_next_clear_bits(params_vdev->dev, reg, bit_mask, false);
}
static void
isp_dpcc_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_dpcc_cfg *arg)
+ const struct isp2x_dpcc_cfg *arg, u32 id)
{
u32 value;
int i;
- value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE);
+ value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE, id);
value &= ISP_DPCC_EN;
value |= !!arg->stage1_enable << 2 |
!!arg->grayscale_mode << 1;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE, id);
value = (arg->sw_rk_out_sel & 0x03) << 5 |
!!arg->sw_dpcc_output_sel << 4 |
@@ -105,15 +126,15 @@
!!arg->stage1_g_3x3 << 2 |
!!arg->stage1_incl_rb_center << 1 |
!!arg->stage1_incl_green_center;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_OUTPUT_MODE);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_OUTPUT_MODE);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_OUTPUT_MODE, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_OUTPUT_MODE, id);
value = !!arg->stage1_use_fix_set << 3 |
!!arg->stage1_use_set_3 << 2 |
!!arg->stage1_use_set_2 << 1 |
!!arg->stage1_use_set_1;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_SET_USE);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_SET_USE);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_SET_USE, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_SET_USE, id);
value = !!arg->sw_rk_red_blue1_en << 13 |
!!arg->rg_red_blue1_enable << 12 |
@@ -127,8 +148,8 @@
!!arg->ro_green1_enable << 2 |
!!arg->lc_green1_enable << 1 |
!!arg->pg_green1_enable;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_1);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_1, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_1, id);
value = !!arg->sw_rk_red_blue2_en << 13 |
!!arg->rg_red_blue2_enable << 12 |
@@ -142,8 +163,8 @@
!!arg->ro_green2_enable << 2 |
!!arg->lc_green2_enable << 1 |
!!arg->pg_green2_enable;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_2);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_2, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_2, id);
value = !!arg->sw_rk_red_blue3_en << 13 |
!!arg->rg_red_blue3_enable << 12 |
@@ -157,74 +178,74 @@
!!arg->ro_green3_enable << 2 |
!!arg->lc_green3_enable << 1 |
!!arg->pg_green3_enable;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_3);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_3, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_3, id);
value = ISP_PACK_4BYTE(arg->line_thr_1_g, arg->line_thr_1_rb,
arg->sw_mindis1_g, arg->sw_mindis1_rb);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_1);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_1, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_1, id);
value = ISP_PACK_4BYTE(arg->line_mad_fac_1_g, arg->line_mad_fac_1_rb,
arg->sw_dis_scale_max1, arg->sw_dis_scale_min1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_1);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_1, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_1, id);
value = ISP_PACK_4BYTE(arg->pg_fac_1_g, arg->pg_fac_1_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_1);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_1, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_1, id);
value = ISP_PACK_4BYTE(arg->rnd_thr_1_g, arg->rnd_thr_1_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_1);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_1, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_1, id);
value = ISP_PACK_4BYTE(arg->rg_fac_1_g, arg->rg_fac_1_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_1);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_1);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_1, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_1, id);
value = ISP_PACK_4BYTE(arg->line_thr_2_g, arg->line_thr_2_rb,
arg->sw_mindis2_g, arg->sw_mindis2_rb);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_2);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_2, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_2, id);
value = ISP_PACK_4BYTE(arg->line_mad_fac_2_g, arg->line_mad_fac_2_rb,
arg->sw_dis_scale_max2, arg->sw_dis_scale_min2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_2);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_2, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_2, id);
value = ISP_PACK_4BYTE(arg->pg_fac_2_g, arg->pg_fac_2_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_2);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_2, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_2, id);
value = ISP_PACK_4BYTE(arg->rnd_thr_2_g, arg->rnd_thr_2_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_2);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_2, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_2, id);
value = ISP_PACK_4BYTE(arg->rg_fac_2_g, arg->rg_fac_2_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_2);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_2);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_2, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_2, id);
value = ISP_PACK_4BYTE(arg->line_thr_3_g, arg->line_thr_3_rb,
arg->sw_mindis3_g, arg->sw_mindis3_rb);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_3);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_3, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_3, id);
value = ISP_PACK_4BYTE(arg->line_mad_fac_3_g, arg->line_mad_fac_3_rb,
arg->sw_dis_scale_max3, arg->sw_dis_scale_min3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_3);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_3, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_3, id);
value = ISP_PACK_4BYTE(arg->pg_fac_3_g, arg->pg_fac_3_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_3);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_3, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_3, id);
value = ISP_PACK_4BYTE(arg->rnd_thr_3_g, arg->rnd_thr_3_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_3);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_3, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_3, id);
value = ISP_PACK_4BYTE(arg->rg_fac_3_g, arg->rg_fac_3_rb, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_3);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_3);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_3, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_3, id);
value = (arg->ro_lim_3_rb & 0x03) << 10 |
(arg->ro_lim_3_g & 0x03) << 8 |
@@ -232,8 +253,8 @@
(arg->ro_lim_2_g & 0x03) << 4 |
(arg->ro_lim_1_rb & 0x03) << 2 |
(arg->ro_lim_1_g & 0x03);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RO_LIMITS);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RO_LIMITS);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RO_LIMITS, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RO_LIMITS, id);
value = (arg->rnd_offs_3_rb & 0x03) << 10 |
(arg->rnd_offs_3_g & 0x03) << 8 |
@@ -241,8 +262,8 @@
(arg->rnd_offs_2_g & 0x03) << 4 |
(arg->rnd_offs_1_rb & 0x03) << 2 |
(arg->rnd_offs_1_g & 0x03);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_OFFS);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_OFFS);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_OFFS, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_OFFS, id);
value = !!arg->bpt_rb_3x3 << 11 |
!!arg->bpt_g_3x3 << 10 |
@@ -254,75 +275,75 @@
!!arg->bpt_use_set_1 << 4 |
!!arg->bpt_cor_en << 1 |
!!arg->bpt_det_en;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_CTRL);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_CTRL, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_CTRL, id);
- isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC0_BPT_NUMBER);
- isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC1_BPT_NUMBER);
- isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC0_BPT_ADDR);
- isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC1_BPT_ADDR);
+ isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC0_BPT_NUMBER, id);
+ isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC1_BPT_NUMBER, id);
+ isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC0_BPT_ADDR, id);
+ isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC1_BPT_ADDR, id);
value = ISP_PACK_2SHORT(arg->bpt_h_addr, arg->bpt_v_addr);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_DATA);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_DATA);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_DATA, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_DATA, id);
- isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC0_BP_CNT);
- isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC1_BP_CNT);
+ isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC0_BP_CNT, id);
+ isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC1_BP_CNT, id);
- isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC0_PDAF_EN);
- isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC1_PDAF_EN);
+ isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC0_PDAF_EN, id);
+ isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC1_PDAF_EN, id);
value = 0;
for (i = 0; i < ISP32_DPCC_PDAF_POINT_NUM; i++)
value |= !!arg->pdaf_point_en[i] << i;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_EN);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_EN);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_EN, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_EN, id);
value = ISP_PACK_2SHORT(arg->pdaf_offsetx, arg->pdaf_offsety);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_OFFSET);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_OFFSET);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_OFFSET, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_OFFSET, id);
value = ISP_PACK_2SHORT(arg->pdaf_wrapx, arg->pdaf_wrapy);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_WRAP);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_WRAP);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_WRAP, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_WRAP, id);
value = ISP_PACK_2SHORT(arg->pdaf_wrapx_num, arg->pdaf_wrapy_num);
- isp3_param_write(params_vdev, value, ISP_DPCC0_PDAF_SCOPE);
- isp3_param_write(params_vdev, value, ISP_DPCC1_PDAF_SCOPE);
+ isp3_param_write(params_vdev, value, ISP_DPCC0_PDAF_SCOPE, id);
+ isp3_param_write(params_vdev, value, ISP_DPCC1_PDAF_SCOPE, id);
for (i = 0; i < ISP32_DPCC_PDAF_POINT_NUM / 2; i++) {
value = ISP_PACK_4BYTE(arg->point[2 * i].x, arg->point[2 * i].y,
arg->point[2 * i + 1].x, arg->point[2 * i + 1].y);
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_0 + 4 * i);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_0 + 4 * i, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_0 + 4 * i, id);
}
- isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC0_PDAF_FORWARD_MED);
- isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC1_PDAF_FORWARD_MED);
+ isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC0_PDAF_FORWARD_MED, id);
+ isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC1_PDAF_FORWARD_MED, id);
}
static void
-isp_dpcc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_dpcc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
- value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE);
+ value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE, id);
value &= ~ISP_DPCC_EN;
if (en)
value |= ISP_DPCC_EN;
- isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE);
- isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE, id);
+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE, id);
}
static void
isp_bls_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_bls_cfg *arg)
+ const struct isp32_bls_cfg *arg, u32 id)
{
const struct isp2x_bls_fixed_val *pval;
u32 new_control, value;
- new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL);
+ new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL, id);
new_control &= (ISP_BLS_ENA | ISP32_BLS_BLS2_EN);
pval = &arg->bls1_val;
@@ -331,29 +352,29 @@
switch (params_vdev->raw_type) {
case RAW_BGGR:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_D_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_C_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_B_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_A_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_A_FIXED, id);
break;
case RAW_GBRG:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_C_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_D_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_A_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_B_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_B_FIXED, id);
break;
case RAW_GRBG:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_B_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_A_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_D_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_C_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_C_FIXED, id);
break;
case RAW_RGGB:
default:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_A_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_B_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_C_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_D_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_D_FIXED, id);
break;
}
}
@@ -363,107 +384,107 @@
if (!arg->enable_auto) {
switch (params_vdev->raw_type) {
case RAW_BGGR:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_D_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_C_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_B_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_A_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_A_FIXED, id);
break;
case RAW_GBRG:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_C_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_D_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_A_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_B_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_B_FIXED, id);
break;
case RAW_GRBG:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_B_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_A_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_D_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_C_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_C_FIXED, id);
break;
case RAW_RGGB:
default:
- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_A_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_B_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_C_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_D_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_D_FIXED, id);
break;
}
} else {
if (arg->en_windows & BIT(1)) {
- isp3_param_write(params_vdev, arg->bls_window2.h_offs, ISP3X_BLS_H2_START);
+ isp3_param_write(params_vdev, arg->bls_window2.h_offs, ISP3X_BLS_H2_START, id);
value = arg->bls_window2.h_offs + arg->bls_window2.h_size;
- isp3_param_write(params_vdev, value, ISP3X_BLS_H2_STOP);
- isp3_param_write(params_vdev, arg->bls_window2.v_offs, ISP3X_BLS_V2_START);
+ isp3_param_write(params_vdev, value, ISP3X_BLS_H2_STOP, id);
+ isp3_param_write(params_vdev, arg->bls_window2.v_offs, ISP3X_BLS_V2_START, id);
value = arg->bls_window2.v_offs + arg->bls_window2.v_size;
- isp3_param_write(params_vdev, value, ISP3X_BLS_V2_STOP);
+ isp3_param_write(params_vdev, value, ISP3X_BLS_V2_STOP, id);
new_control |= ISP_BLS_WINDOW_2;
}
if (arg->en_windows & BIT(0)) {
- isp3_param_write(params_vdev, arg->bls_window1.h_offs, ISP3X_BLS_H1_START);
+ isp3_param_write(params_vdev, arg->bls_window1.h_offs, ISP3X_BLS_H1_START, id);
value = arg->bls_window1.h_offs + arg->bls_window1.h_size;
- isp3_param_write(params_vdev, value, ISP3X_BLS_H1_STOP);
- isp3_param_write(params_vdev, arg->bls_window1.v_offs, ISP3X_BLS_V1_START);
+ isp3_param_write(params_vdev, value, ISP3X_BLS_H1_STOP, id);
+ isp3_param_write(params_vdev, arg->bls_window1.v_offs, ISP3X_BLS_V1_START, id);
value = arg->bls_window1.v_offs + arg->bls_window1.v_size;
- isp3_param_write(params_vdev, value, ISP3X_BLS_V1_STOP);
+ isp3_param_write(params_vdev, value, ISP3X_BLS_V1_STOP, id);
new_control |= ISP_BLS_WINDOW_1;
}
- isp3_param_write(params_vdev, arg->bls_samples, ISP3X_BLS_SAMPLES);
+ isp3_param_write(params_vdev, arg->bls_samples, ISP3X_BLS_SAMPLES, id);
new_control |= ISP_BLS_MODE_MEASURED;
}
- isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL);
+ isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL, id);
- isp3_param_write(params_vdev, arg->isp_ob_offset, ISP32_BLS_ISP_OB_OFFSET);
- isp3_param_write(params_vdev, arg->isp_ob_predgain, ISP32_BLS_ISP_OB_PREDGAIN);
- isp3_param_write(params_vdev, arg->isp_ob_max, ISP32_BLS_ISP_OB_MAX);
+ isp3_param_write(params_vdev, arg->isp_ob_offset, ISP32_BLS_ISP_OB_OFFSET, id);
+ isp3_param_write(params_vdev, arg->isp_ob_predgain, ISP32_BLS_ISP_OB_PREDGAIN, id);
+ isp3_param_write(params_vdev, arg->isp_ob_max, ISP32_BLS_ISP_OB_MAX, id);
}
static void
-isp_bls_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_bls_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 new_control;
- new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL);
+ new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL, id);
if (en)
new_control |= ISP_BLS_ENA;
else
new_control &= ~ISP_BLS_ENA;
- isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL);
+ isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL, id);
}
static void
isp_sdg_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_sdg_cfg *arg)
+ const struct isp2x_sdg_cfg *arg, u32 id)
{
int i;
- isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx0, ISP3X_ISP_GAMMA_DX_LO);
- isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx1, ISP3X_ISP_GAMMA_DX_HI);
+ isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx0, ISP3X_ISP_GAMMA_DX_LO, id);
+ isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx1, ISP3X_ISP_GAMMA_DX_HI, id);
for (i = 0; i < ISP32_DEGAMMA_CURVE_SIZE; i++) {
isp3_param_write(params_vdev, arg->curve_r.gamma_y[i],
- ISP3X_ISP_GAMMA_R_Y_0 + i * 4);
+ ISP3X_ISP_GAMMA_R_Y_0 + i * 4, id);
isp3_param_write(params_vdev, arg->curve_g.gamma_y[i],
- ISP3X_ISP_GAMMA_G_Y_0 + i * 4);
+ ISP3X_ISP_GAMMA_G_Y_0 + i * 4, id);
isp3_param_write(params_vdev, arg->curve_b.gamma_y[i],
- ISP3X_ISP_GAMMA_B_Y_0 + i * 4);
+ ISP3X_ISP_GAMMA_B_Y_0 + i * 4, id);
}
}
static void
-isp_sdg_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_sdg_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 val;
- val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
+ val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
if (en)
isp3_param_write(params_vdev, val | CIF_ISP_CTRL_ISP_GAMMA_IN_ENA,
- ISP3X_ISP_CTRL0);
+ ISP3X_ISP_CTRL0, id);
else
isp3_param_write(params_vdev, val & ~CIF_ISP_CTRL_ISP_GAMMA_IN_ENA,
- ISP3X_ISP_CTRL0);
+ ISP3X_ISP_CTRL0, id);
}
static void __maybe_unused
@@ -524,21 +545,21 @@
}
rkisp_prepare_buffer(params_vdev->dev, &priv_val->buf_lsclut[buf_idx]);
data = priv_val->buf_lsclut[buf_idx].dma_addr;
- isp3_param_write(params_vdev, data, ISP3X_MI_LUT_LSC_RD_BASE);
- isp3_param_write(params_vdev, ISP32_LSC_LUT_TBL_SIZE, ISP3X_MI_LUT_LSC_RD_WSIZE);
+ isp3_param_write(params_vdev, data, ISP3X_MI_LUT_LSC_RD_BASE, 0);
+ isp3_param_write(params_vdev, ISP32_LSC_LUT_TBL_SIZE, ISP3X_MI_LUT_LSC_RD_WSIZE, 0);
}
static void
isp_lsc_matrix_cfg_sram(struct rkisp_isp_params_vdev *params_vdev,
const struct isp3x_lsc_cfg *pconfig,
- bool is_check)
+ bool is_check, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
u32 sram_addr, data, table;
int i, j;
if (is_check &&
- !(isp3_param_read(params_vdev, ISP3X_LSC_CTRL) & ISP_LSC_EN))
+ !(isp3_param_read(params_vdev, ISP3X_LSC_CTRL, id) & ISP_LSC_EN))
return;
table = isp3_param_read_direct(params_vdev, ISP3X_LSC_STATUS);
@@ -601,21 +622,21 @@
(struct rkisp_isp_params_vdev *)data;
struct isp32_isp_params_cfg *params = params_vdev->isp32_params;
- isp_lsc_matrix_cfg_sram(params_vdev, ¶ms->others.lsc_cfg, true);
+ isp_lsc_matrix_cfg_sram(params_vdev, ¶ms->others.lsc_cfg, true, 0);
}
static void
isp_lsc_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp3x_lsc_cfg *arg)
+ const struct isp3x_lsc_cfg *arg, u32 id)
{
struct rkisp_isp_params_val_v32 *priv_val =
(struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
struct rkisp_device *dev = params_vdev->dev;
u32 data, lsc_ctrl;
int i;
- lsc_ctrl = isp3_param_read(params_vdev, ISP3X_LSC_CTRL);
+ lsc_ctrl = isp3_param_read(params_vdev, ISP3X_LSC_CTRL, id);
if (dev->isp_ver == ISP_V32_L) {
/* one lsc sram table
* online mode lsc lut load from ddr quick for some sensor VB short
@@ -625,7 +646,7 @@
if (!IS_HDR_RDBK(dev->rd_mode))
isp_lsc_matrix_cfg_ddr(params_vdev, arg);
else if (dev->hw_dev->is_single)
- isp_lsc_matrix_cfg_sram(params_vdev, arg, false);
+ isp_lsc_matrix_cfg_sram(params_vdev, arg, false, id);
else
params_rec->others.lsc_cfg = *arg;
} else {
@@ -637,27 +658,27 @@
for (i = 0; i < ISP32_LSC_SIZE_TBL_SIZE / 4; i++) {
/* program x size tables */
data = CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2], arg->x_size_tbl[i * 2 + 1]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_01 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_01 + i * 4, id);
data = CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2 + 8], arg->x_size_tbl[i * 2 + 9]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_89 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_89 + i * 4, id);
/* program x grad tables */
data = CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2], arg->x_grad_tbl[i * 2 + 1]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_01 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_01 + i * 4, id);
data = CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2 + 8], arg->x_grad_tbl[i * 2 + 9]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_89 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_89 + i * 4, id);
/* program y size tables */
data = CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2], arg->y_size_tbl[i * 2 + 1]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_01 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_01 + i * 4, id);
data = CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2 + 8], arg->y_size_tbl[i * 2 + 9]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_89 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_89 + i * 4, id);
/* program y grad tables */
data = CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2], arg->y_grad_tbl[i * 2 + 1]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_01 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_01 + i * 4, id);
data = CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2 + 8], arg->y_grad_tbl[i * 2 + 9]);
- isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_89 + i * 4);
+ isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_89 + i * 4, id);
}
if (arg->sector_16x16)
@@ -666,15 +687,15 @@
lsc_ctrl &= ~ISP3X_LSC_SECTOR_16X16;
if (dev->isp_ver == ISP_V32_L && !IS_HDR_RDBK(dev->rd_mode))
lsc_ctrl |= ISP3X_LSC_LUT_EN;
- isp3_param_write(params_vdev, lsc_ctrl, ISP3X_LSC_CTRL);
+ isp3_param_write(params_vdev, lsc_ctrl, ISP3X_LSC_CTRL, id);
}
static void
-isp_lsc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_lsc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
- u32 val = isp3_param_read(params_vdev, ISP3X_LSC_CTRL);
+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
+ u32 val = isp3_param_read(params_vdev, ISP3X_LSC_CTRL, id);
if (en == !!(val & ISP_LSC_EN))
return;
@@ -683,99 +704,99 @@
val = ISP_LSC_EN | ISP32_SELF_FORCE_UPD;
if (dev->isp_ver == ISP_V32_L && !IS_HDR_RDBK(dev->rd_mode))
val |= ISP3X_LSC_LUT_EN;
- isp3_param_set_bits(params_vdev, ISP3X_LSC_CTRL, val);
+ isp3_param_set_bits(params_vdev, ISP3X_LSC_CTRL, val, id);
if (dev->isp_ver == ISP_V32 && params_vdev->dev->hw_dev->is_single)
isp_lsc_matrix_cfg_sram(params_vdev,
- ¶ms_rec->others.lsc_cfg, false);
+ ¶ms_rec->others.lsc_cfg, false, id);
} else {
- isp3_param_clear_bits(params_vdev, ISP3X_LSC_CTRL, ISP_LSC_EN);
- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(8));
+ isp3_param_clear_bits(params_vdev, ISP3X_LSC_CTRL, ISP_LSC_EN, id);
+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(8), id);
}
}
static void
isp_debayer_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_debayer_cfg *arg)
+ const struct isp32_debayer_cfg *arg, u32 id)
{
u32 value;
- value = isp3_param_read(params_vdev, ISP3X_DEBAYER_CONTROL);
+ value = isp3_param_read(params_vdev, ISP3X_DEBAYER_CONTROL, id);
value &= ISP_DEBAYER_EN;
value |= !!arg->filter_g_en << 4;
if (params_vdev->dev->isp_ver == ISP_V32)
value |= !!arg->filter_c_en << 8;
- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_CONTROL);
+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_CONTROL, id);
value = (arg->max_ratio & 0x3F) << 24 | arg->select_thed << 16 |
(arg->thed1 & 0x0F) << 12 | (arg->thed0 & 0x0F) << 8 |
(arg->dist_scale & 0x0F) << 4 | !!arg->clip_en;
- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP);
+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP, id);
value = (arg->filter1_coe4 & 0x1F) << 24 | (arg->filter1_coe3 & 0x1F) << 16 |
(arg->filter1_coe2 & 0x1F) << 8 | (arg->filter1_coe1 & 0x1F);
- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER1);
+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER1, id);
value = (arg->filter2_coe4 & 0x1F) << 24 | (arg->filter2_coe3 & 0x1F) << 16 |
(arg->filter2_coe2 & 0x1F) << 8 | (arg->filter2_coe1 & 0x1F);
- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER2);
+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER2, id);
value = arg->hf_offset << 16 | (arg->gain_offset & 0xFFF);
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_INTERP_OFFSET);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_INTERP_OFFSET, id);
value = (arg->offset & 0x7FF);
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_FILTER_OFFSET);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_FILTER_OFFSET, id);
if (params_vdev->dev->isp_ver != ISP_V32)
return;
value = arg->guid_gaus_coe2 << 16 |
arg->guid_gaus_coe1 << 8 | arg->guid_gaus_coe0;
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_GUIDE_GAUS);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_GUIDE_GAUS, id);
value = arg->ce_gaus_coe2 << 16 |
arg->ce_gaus_coe1 << 8 | arg->ce_gaus_coe0;
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_CE_GAUS);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_CE_GAUS, id);
value = arg->alpha_gaus_coe2 << 16 |
arg->alpha_gaus_coe1 << 8 | arg->alpha_gaus_coe0;
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA_GAUS);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA_GAUS, id);
value = (arg->loggd_offset & 0xfff) << 16 | (arg->loghf_offset & 0x1fff);
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_LOG_OFFSET);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_LOG_OFFSET, id);
value = (arg->alpha_scale & 0xfffff) << 12 | (arg->alpha_offset & 0xfff);
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA, id);
value = (arg->edge_scale & 0xfffff) << 12 | (arg->edge_offset & 0xfff);
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_EDGE);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_EDGE, id);
value = (arg->wgtslope & 0xfff) << 16 |
(arg->exp_shift & 0x3f) << 8 | arg->ce_sgm;
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_0);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_0, id);
value = (arg->wet_ghost & 0x3f) << 8 | (arg->wet_clip & 0x7f);
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_1);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_1, id);
value = (arg->bf_curwgt & 0x7f) << 24 |
(arg->bf_clip & 0x7f) << 16 | arg->bf_sgm;
- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_BF);
+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_BF, id);
}
static void
-isp_debayer_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_debayer_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
if (en)
isp3_param_set_bits(params_vdev,
- ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN);
+ ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN, id);
else
isp3_param_clear_bits(params_vdev,
- ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN);
+ ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN, id);
}
static void
isp_awbgain_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_awb_gain_cfg *arg)
+ const struct isp32_awb_gain_cfg *arg, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
@@ -791,184 +812,184 @@
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->gain0_green_b, arg->gain0_green_r),
- ISP3X_ISP_AWB_GAIN0_G);
+ ISP3X_ISP_AWB_GAIN0_G, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->gain0_blue, arg->gain0_red),
- ISP3X_ISP_AWB_GAIN0_RB);
+ ISP3X_ISP_AWB_GAIN0_RB, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->gain1_green_b, arg->gain1_green_r),
- ISP3X_ISP_AWB_GAIN1_G);
+ ISP3X_ISP_AWB_GAIN1_G, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->gain1_blue, arg->gain1_red),
- ISP3X_ISP_AWB_GAIN1_RB);
+ ISP3X_ISP_AWB_GAIN1_RB, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->gain2_green_b, arg->gain2_green_r),
- ISP3X_ISP_AWB_GAIN2_G);
+ ISP3X_ISP_AWB_GAIN2_G, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->gain2_blue, arg->gain2_red),
- ISP3X_ISP_AWB_GAIN2_RB);
+ ISP3X_ISP_AWB_GAIN2_RB, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->awb1_gain_gb, arg->awb1_gain_gr),
- ISP32_ISP_AWB1_GAIN_G);
+ ISP32_ISP_AWB1_GAIN_G, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->awb1_gain_b, arg->awb1_gain_r),
- ISP32_ISP_AWB1_GAIN_RB);
+ ISP32_ISP_AWB1_GAIN_RB, id);
}
static void
-isp_awbgain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_awbgain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 val;
- val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
+ val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
if (en)
isp3_param_write(params_vdev, val | CIF_ISP_CTRL_ISP_AWB_ENA,
- ISP3X_ISP_CTRL0);
+ ISP3X_ISP_CTRL0, id);
else
isp3_param_write(params_vdev, val & ~CIF_ISP_CTRL_ISP_AWB_ENA,
- ISP3X_ISP_CTRL0);
+ ISP3X_ISP_CTRL0, id);
}
static void
isp_ccm_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_ccm_cfg *arg)
+ const struct isp32_ccm_cfg *arg, u32 id)
{
u32 value;
u32 i;
- value = isp3_param_read(params_vdev, ISP3X_CCM_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_CCM_CTRL, id);
value &= ISP_CCM_EN;
value |= !!arg->asym_adj_en << 3 |
!!arg->enh_adj_en << 2 |
!!arg->highy_adjust_dis << 1;
- isp3_param_write(params_vdev, value, ISP3X_CCM_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_CTRL, id);
value = ISP_PACK_2SHORT(arg->coeff0_r, arg->coeff1_r);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_R);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_R, id);
value = ISP_PACK_2SHORT(arg->coeff2_r, arg->offset_r);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_R);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_R, id);
value = ISP_PACK_2SHORT(arg->coeff0_g, arg->coeff1_g);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_G);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_G, id);
value = ISP_PACK_2SHORT(arg->coeff2_g, arg->offset_g);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_G);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_G, id);
value = ISP_PACK_2SHORT(arg->coeff0_b, arg->coeff1_b);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_B);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_B, id);
value = ISP_PACK_2SHORT(arg->coeff2_b, arg->offset_b);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_B);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_B, id);
value = ISP_PACK_2SHORT(arg->coeff0_y, arg->coeff1_y);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_Y);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_Y, id);
value = ISP_PACK_2SHORT(arg->coeff2_y, 0);
- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_Y);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_Y, id);
for (i = 0; i < ISP32_CCM_CURVE_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->alp_y[2 * i], arg->alp_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_CCM_ALP_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_ALP_Y0 + 4 * i, id);
}
value = (arg->right_bit & 0xf) << 4 | (arg->bound_bit & 0xf);
- isp3_param_write(params_vdev, value, ISP3X_CCM_BOUND_BIT);
+ isp3_param_write(params_vdev, value, ISP3X_CCM_BOUND_BIT, id);
value = (arg->color_coef1_g2y & 0x7ff) << 16 |
(arg->color_coef0_r2y & 0x7ff);
- isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE0);
+ isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE0, id);
value = (arg->color_enh_rat_max & 0x3fff) << 16 |
(arg->color_coef2_b2y & 0x7ff);
- isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE1);
+ isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE1, id);
}
static void
-isp_ccm_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_ccm_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
if (en)
- isp3_param_set_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN);
+ isp3_param_set_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN, id);
else
- isp3_param_clear_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN);
+ isp3_param_clear_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN, id);
}
static void
isp_goc_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp3x_gammaout_cfg *arg)
+ const struct isp3x_gammaout_cfg *arg, u32 id)
{
int i;
u32 value;
- value = isp3_param_read(params_vdev, ISP3X_GAMMA_OUT_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_GAMMA_OUT_CTRL, id);
value &= ISP3X_GAMMA_OUT_EN;
value |= !!arg->equ_segm << 1 | !!arg->finalx4_dense_en << 2;
- isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_CTRL, id);
- isp3_param_write(params_vdev, arg->offset, ISP3X_GAMMA_OUT_OFFSET);
+ isp3_param_write(params_vdev, arg->offset, ISP3X_GAMMA_OUT_OFFSET, id);
for (i = 0; i < ISP32_GAMMA_OUT_MAX_SAMPLES / 2; i++) {
value = ISP_PACK_2SHORT(arg->gamma_y[2 * i],
arg->gamma_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_Y0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_Y0 + i * 4, id);
}
- isp3_param_write(params_vdev, arg->gamma_y[2 * i], ISP3X_GAMMA_OUT_Y0 + i * 4);
+ isp3_param_write(params_vdev, arg->gamma_y[2 * i], ISP3X_GAMMA_OUT_Y0 + i * 4, id);
}
static void
-isp_goc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_goc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
if (en)
- isp3_param_set_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN);
+ isp3_param_set_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN, id);
else
- isp3_param_clear_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN);
+ isp3_param_clear_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN, id);
}
static void
isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_cproc_cfg *arg)
+ const struct isp2x_cproc_cfg *arg, u32 id)
{
u32 quantization = params_vdev->quantization;
- isp3_param_write(params_vdev, arg->contrast, ISP3X_CPROC_CONTRAST);
- isp3_param_write(params_vdev, arg->hue, ISP3X_CPROC_HUE);
- isp3_param_write(params_vdev, arg->sat, ISP3X_CPROC_SATURATION);
- isp3_param_write(params_vdev, arg->brightness, ISP3X_CPROC_BRIGHTNESS);
+ isp3_param_write(params_vdev, arg->contrast, ISP3X_CPROC_CONTRAST, id);
+ isp3_param_write(params_vdev, arg->hue, ISP3X_CPROC_HUE, id);
+ isp3_param_write(params_vdev, arg->sat, ISP3X_CPROC_SATURATION, id);
+ isp3_param_write(params_vdev, arg->brightness, ISP3X_CPROC_BRIGHTNESS, id);
if (quantization != V4L2_QUANTIZATION_FULL_RANGE) {
isp3_param_clear_bits(params_vdev, ISP3X_CPROC_CTRL,
CIF_C_PROC_YOUT_FULL |
CIF_C_PROC_YIN_FULL |
- CIF_C_PROC_COUT_FULL);
+ CIF_C_PROC_COUT_FULL, id);
} else {
isp3_param_set_bits(params_vdev, ISP3X_CPROC_CTRL,
CIF_C_PROC_YOUT_FULL |
CIF_C_PROC_YIN_FULL |
- CIF_C_PROC_COUT_FULL);
+ CIF_C_PROC_COUT_FULL, id);
}
}
static void
-isp_cproc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_cproc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
if (en)
isp3_param_set_bits(params_vdev, ISP3X_CPROC_CTRL,
- CIF_C_PROC_CTR_ENABLE);
+ CIF_C_PROC_CTR_ENABLE, id);
else
isp3_param_clear_bits(params_vdev, ISP3X_CPROC_CTRL,
- CIF_C_PROC_CTR_ENABLE);
+ CIF_C_PROC_CTR_ENABLE, id);
}
static void
isp_ie_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_ie_cfg *arg)
+ const struct isp2x_ie_cfg *arg, u32 id)
{
u32 eff_ctrl;
- eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL);
+ eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL, id);
eff_ctrl &= ~CIF_IMG_EFF_CTRL_MODE_MASK;
if (params_vdev->quantization == V4L2_QUANTIZATION_FULL_RANGE)
@@ -979,7 +1000,7 @@
eff_ctrl |= CIF_IMG_EFF_CTRL_MODE_SEPIA;
break;
case V4L2_COLORFX_SET_CBCR:
- isp3_param_write(params_vdev, arg->eff_tint, ISP3X_IMG_EFF_TINT);
+ isp3_param_write(params_vdev, arg->eff_tint, ISP3X_IMG_EFF_TINT, id);
eff_ctrl |= CIF_IMG_EFF_CTRL_MODE_SEPIA;
break;
/*
@@ -989,25 +1010,25 @@
case V4L2_COLORFX_AQUA:
eff_ctrl |= CIF_IMG_EFF_CTRL_MODE_COLOR_SEL;
isp3_param_write(params_vdev, arg->color_sel,
- ISP3X_IMG_EFF_COLOR_SEL);
+ ISP3X_IMG_EFF_COLOR_SEL, id);
break;
case V4L2_COLORFX_EMBOSS:
eff_ctrl |= CIF_IMG_EFF_CTRL_MODE_EMBOSS;
isp3_param_write(params_vdev, arg->eff_mat_1,
- CIF_IMG_EFF_MAT_1);
+ CIF_IMG_EFF_MAT_1, id);
isp3_param_write(params_vdev, arg->eff_mat_2,
- CIF_IMG_EFF_MAT_2);
+ CIF_IMG_EFF_MAT_2, id);
isp3_param_write(params_vdev, arg->eff_mat_3,
- CIF_IMG_EFF_MAT_3);
+ CIF_IMG_EFF_MAT_3, id);
break;
case V4L2_COLORFX_SKETCH:
eff_ctrl |= CIF_IMG_EFF_CTRL_MODE_SKETCH;
isp3_param_write(params_vdev, arg->eff_mat_3,
- CIF_IMG_EFF_MAT_3);
+ CIF_IMG_EFF_MAT_3, id);
isp3_param_write(params_vdev, arg->eff_mat_4,
- CIF_IMG_EFF_MAT_4);
+ CIF_IMG_EFF_MAT_4, id);
isp3_param_write(params_vdev, arg->eff_mat_5,
- CIF_IMG_EFF_MAT_5);
+ CIF_IMG_EFF_MAT_5, id);
break;
case V4L2_COLORFX_BW:
eff_ctrl |= CIF_IMG_EFF_CTRL_MODE_BLACKWHITE;
@@ -1019,25 +1040,26 @@
break;
}
- isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL);
+ isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL, id);
}
static void
-isp_ie_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_ie_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
if (en) {
isp3_param_set_bits(params_vdev, ISP3X_IMG_EFF_CTRL,
CIF_IMG_EFF_CTRL_CFG_UPD |
- CIF_IMG_EFF_CTRL_ENABLE);
+ CIF_IMG_EFF_CTRL_ENABLE, id);
} else {
isp3_param_clear_bits(params_vdev, ISP3X_IMG_EFF_CTRL,
- CIF_IMG_EFF_CTRL_ENABLE);
+ CIF_IMG_EFF_CTRL_ENABLE, id);
}
}
static void
isp_rawae_config_foraf(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_rawaf_meas_cfg *arg)
+ const struct isp32_rawaf_meas_cfg *arg,
+ struct isp2x_window *win, u32 id)
{
u32 block_hsize, block_vsize;
u32 addr, value;
@@ -1052,33 +1074,40 @@
} else {
addr = ISP3X_RAWAE_BIG1_BASE;
}
- value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
+ value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
value &= ISP3X_RAWAE_BIG_EN;
value |= ISP3X_RAWAE_BIG_WND0_NUM(wnd_num_idx);
- isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL);
+ isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL, id);
isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->win[0].h_offs, arg->win[0].v_offs),
- addr + ISP3X_RAWAE_BIG_OFFSET);
+ ISP_PACK_2SHORT(win->h_offs, win->v_offs),
+ addr + ISP3X_RAWAE_BIG_OFFSET, id);
- block_hsize = arg->win[0].h_size / ae_wnd_num[wnd_num_idx];
- block_vsize = arg->win[0].v_size / ae_wnd_num[wnd_num_idx];
+ block_hsize = win->h_size / ae_wnd_num[wnd_num_idx];
+ block_vsize = win->v_size / ae_wnd_num[wnd_num_idx];
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(block_hsize, block_vsize),
- addr + ISP3X_RAWAE_BIG_BLK_SIZE);
+ addr + ISP3X_RAWAE_BIG_BLK_SIZE, id);
}
static void
isp_rawaf_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_rawaf_meas_cfg *arg)
+ const struct isp32_rawaf_meas_cfg *arg, u32 id)
{
+ struct rkisp_device *dev = params_vdev->dev;
+ struct v4l2_rect *out_crop = &dev->isp_sdev.out_crop;
+ u32 width = out_crop->width, height = out_crop->height;
u32 i, var, ctrl;
u16 h_size, v_size;
u16 h_offs, v_offs;
u8 gaus_en, viir_en, v1_fir_sel;
size_t num_of_win = min_t(size_t, ARRAY_SIZE(arg->win),
arg->num_afm_win);
+ struct isp2x_window win_ae;
+
+ if (dev->hw_dev->unite)
+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
for (i = 0; i < num_of_win; i++) {
h_size = arg->win[i].h_size;
@@ -1086,9 +1115,19 @@
h_offs = arg->win[i].h_offs < 2 ? 2 : arg->win[i].h_offs;
v_offs = arg->win[i].v_offs < 1 ? 1 : arg->win[i].v_offs;
+ if (!v_size || v_size + v_offs - 2 > height)
+ v_size = height - v_offs - 2;
+ if (!h_size || h_size + h_offs - 2 > width)
+ h_size = width - h_offs - 2;
+
if (i == 0) {
h_size = h_size / 15 * 15;
v_size = v_size / 15 * 15;
+
+ win_ae.h_size = h_size;
+ win_ae.v_size = v_size;
+ win_ae.h_offs = h_offs;
+ win_ae.v_offs = v_offs;
}
/*
@@ -1097,7 +1136,7 @@
*/
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(v_offs, h_offs),
- ISP3X_RAWAF_OFFSET_WINA + i * 8);
+ ISP3X_RAWAF_OFFSET_WINA + i * 8, id);
/*
* value must be smaller than [width of picture -2]
@@ -1105,7 +1144,7 @@
*/
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(v_size, h_size),
- ISP3X_RAWAF_SIZE_WINA + i * 8);
+ ISP3X_RAWAF_SIZE_WINA + i * 8, id);
}
var = 0;
@@ -1114,60 +1153,60 @@
var |= ISP3X_RAWAF_INTLINE0_EN << i;
var |= ISP3X_RAWAF_INELINE0(arg->line_num[i]) << 4 * i;
}
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_INT_LINE);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_INT_LINE, id);
if (params_vdev->dev->isp_ver == ISP_V32_L) {
var = (arg->hldg_dilate_num & 0x7) << 16 |
!!arg->bls_en << 12 | (arg->bls_offset & 0x1FF);
- isp3_param_write(params_vdev, var, ISP32L_RAWAF_CTRL1);
+ isp3_param_write(params_vdev, var, ISP32L_RAWAF_CTRL1, id);
}
- var = isp3_param_read(params_vdev, ISP3X_RAWAF_THRES);
+ var = isp3_param_read(params_vdev, ISP3X_RAWAF_THRES, id);
var &= ~0xFFFF;
var |= arg->afm_thres;
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_THRES);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_THRES, id);
var = (arg->lum_var_shift[1] & 0x7) << 20 | (arg->lum_var_shift[0] & 0x7) << 16 |
(arg->afm_var_shift[1] & 0x7) << 4 | (arg->afm_var_shift[0] & 0x7);
if (params_vdev->dev->isp_ver == ISP_V32_L)
var |= (arg->tnrin_shift & 0xf) << 8;
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_VAR_SHIFT);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_VAR_SHIFT, id);
for (i = 0; i < ISP32_RAWAF_GAMMA_NUM / 2; i++) {
var = ISP_PACK_2SHORT(arg->gamma_y[2 * i], arg->gamma_y[2 * i + 1]);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y0 + i * 4);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y0 + i * 4, id);
}
var = ISP_PACK_2SHORT(arg->gamma_y[16], 0);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y8);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y8, id);
var = (arg->v1iir_var_shift & 0x7) << 8 | (arg->h1iir_var_shift & 0x7);
if (params_vdev->dev->isp_ver == ISP_V32)
var |= (arg->v2iir_var_shift & 0x7) << 12 | (arg->h2iir_var_shift & 0x7) << 4;
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_HVIIR_VAR_SHIFT);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_HVIIR_VAR_SHIFT, id);
var = ISP_PACK_2SHORT(arg->h_fv_thresh, arg->v_fv_thresh);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_HIIR_THRESH);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_HIIR_THRESH, id);
for (i = 0; i < ISP32_RAWAF_VFIR_COE_NUM; i++) {
var = ISP_PACK_2SHORT(arg->v1fir_coe[i], arg->v2fir_coe[i]);
- isp3_param_write(params_vdev, var, ISP32_RAWAF_V_FIR_COE0 + i * 4);
+ isp3_param_write(params_vdev, var, ISP32_RAWAF_V_FIR_COE0 + i * 4, id);
}
for (i = 0; i < ISP32_RAWAF_GAUS_COE_NUM / 4; i++) {
var = ISP_PACK_4BYTE(arg->gaus_coe[i * 4], arg->gaus_coe[i * 4 + 1],
arg->gaus_coe[i * 4 + 2], arg->gaus_coe[i * 4 + 3]);
- isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE03 + i * 4);
+ isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE03 + i * 4, id);
}
var = ISP_PACK_4BYTE(arg->gaus_coe[ISP32_RAWAF_GAUS_COE_NUM - 1], 0, 0, 0);
- isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE8);
+ isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE8, id);
- isp3_param_write(params_vdev, arg->highlit_thresh, ISP3X_RAWAF_HIGHLIT_THRESH);
+ isp3_param_write(params_vdev, arg->highlit_thresh, ISP3X_RAWAF_HIGHLIT_THRESH, id);
if (params_vdev->dev->isp_ver == ISP_V32_L) {
var = ISP_PACK_2SHORT(arg->h_fv_limit, arg->h_fv_slope);
- isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_H);
+ isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_H, id);
var = ISP_PACK_2SHORT(arg->v_fv_limit, arg->v_fv_slope);
- isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_V);
+ isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_V, id);
}
viir_en = arg->viir_en;
@@ -1176,23 +1215,23 @@
if (viir_en == 0)
v1_fir_sel = 0;
- ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL);
+ ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL, id);
ctrl &= ISP3X_RAWAF_EN;
if (arg->hiir_en) {
ctrl |= ISP3X_RAWAF_HIIR_EN;
for (i = 0; i < ISP32_RAWAF_HIIR_COE_NUM / 2; i++) {
var = ISP_PACK_2SHORT(arg->h1iir1_coe[i * 2], arg->h1iir1_coe[i * 2 + 1]);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR1_COE01 + i * 4);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR1_COE01 + i * 4, id);
var = ISP_PACK_2SHORT(arg->h1iir2_coe[i * 2], arg->h1iir2_coe[i * 2 + 1]);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR2_COE01 + i * 4);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR2_COE01 + i * 4, id);
if (params_vdev->dev->isp_ver == ISP_V32_L)
continue;
var = ISP_PACK_2SHORT(arg->h2iir1_coe[i * 2], arg->h2iir1_coe[i * 2 + 1]);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR1_COE01 + i * 4);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR1_COE01 + i * 4, id);
var = ISP_PACK_2SHORT(arg->h2iir2_coe[i * 2], arg->h2iir2_coe[i * 2 + 1]);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR2_COE01 + i * 4);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR2_COE01 + i * 4, id);
}
}
if (viir_en) {
@@ -1202,7 +1241,7 @@
var = ISP_PACK_2SHORT(arg->v1iir_coe[i], arg->v2iir_coe[i]);
else
var = ISP_PACK_2SHORT(arg->v1iir_coe[i], 0);
- isp3_param_write(params_vdev, var, ISP3X_RAWAF_V_IIR_COE0 + i * 4);
+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_V_IIR_COE0 + i * 4, id);
}
}
if (arg->ldg_en) {
@@ -1212,12 +1251,12 @@
arg->curve_h[i].ldg_lumth |
arg->curve_h[i].ldg_gain << 8 |
arg->curve_h[i].ldg_gslp << 16,
- ISP3X_RAWAF_H_CURVEL + i * 16);
+ ISP3X_RAWAF_H_CURVEL + i * 16, id);
isp3_param_write(params_vdev,
arg->curve_v[i].ldg_lumth |
arg->curve_v[i].ldg_gain << 8 |
arg->curve_v[i].ldg_gslp << 16,
- ISP3X_RAWAF_V_CURVEL + i * 16);
+ ISP3X_RAWAF_V_CURVEL + i * 16, id);
}
}
@@ -1239,9 +1278,9 @@
!!arg->v1_acc_mode << 26 |
!!arg->v2_acc_mode << 27 |
!!arg->ae_sel << 29;
- isp3_param_write(params_vdev, ctrl, ISP3X_RAWAF_CTRL);
+ isp3_param_write(params_vdev, ctrl, ISP3X_RAWAF_CTRL, id);
- ctrl = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
+ ctrl = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
if (((ctrl & ISP3X_RAWAF_SEL(3)) != ISP3X_RAWAF_SEL(arg->rawaf_sel)) ||
(((!!(ctrl & ISP32L_BNR2AF_SEL)) != arg->bnr2af_sel) &&
(params_vdev->dev->isp_ver == ISP_V32_L))) {
@@ -1254,16 +1293,16 @@
else
ctrl &= ~ISP32L_BNR2AF_SEL;
}
- isp3_param_write(params_vdev, ctrl, ISP3X_VI_ISP_PATH);
+ isp3_param_write(params_vdev, ctrl, ISP3X_VI_ISP_PATH, id);
}
params_vdev->afaemode_en = arg->ae_mode;
if (params_vdev->afaemode_en)
- isp_rawae_config_foraf(params_vdev, arg);
+ isp_rawae_config_foraf(params_vdev, arg, &win_ae, id);
}
static void
-isp_rawae_enable_foraf(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawae_enable_foraf(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 exp_ctrl;
u32 addr = ISP3X_RAWAE_BIG1_BASE;
@@ -1271,20 +1310,20 @@
if (params_vdev->dev->isp_ver == ISP_V32_L)
addr = ISP3X_RAWAE_LITE_BASE;
- exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
+ exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
exp_ctrl &= ~ISP32_REG_WR_MASK;
if (en)
exp_ctrl |= ISP32_MODULE_EN;
else
exp_ctrl &= ~ISP32_MODULE_EN;
- isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL);
+ isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL, id);
}
static void
-isp_rawaf_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawaf_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- u32 afm_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL);
+ u32 afm_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL, id);
afm_ctrl &= ~ISP32_REG_WR_MASK;
if (en)
@@ -1292,9 +1331,9 @@
else
afm_ctrl &= ~ISP3X_RAWAF_EN;
- isp3_param_write(params_vdev, afm_ctrl, ISP3X_RAWAF_CTRL);
+ isp3_param_write(params_vdev, afm_ctrl, ISP3X_RAWAF_CTRL, id);
if (params_vdev->afaemode_en) {
- isp_rawae_enable_foraf(params_vdev, en);
+ isp_rawae_enable_foraf(params_vdev, en, id);
if (!en)
params_vdev->afaemode_en = false;
}
@@ -1302,78 +1341,78 @@
static void
isp_rawaelite_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawaelite_meas_cfg *arg)
+ const struct isp2x_rawaelite_meas_cfg *arg, u32 id)
{
struct rkisp_device *ispdev = params_vdev->dev;
struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
- u32 width = out_crop->width;
+ u32 width = out_crop->width, height = out_crop->height;
+ u32 h_size, v_size, h_offs, v_offs;
u32 block_hsize, block_vsize, value;
u32 wnd_num_idx = 0;
const u32 ae_wnd_num[] = {1, 5};
- value = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL, id);
value &= ~(ISP3X_RAWAE_LITE_WNDNUM);
if (arg->wnd_num) {
value |= ISP3X_RAWAE_LITE_WNDNUM;
wnd_num_idx = 1;
}
value &= ~ISP32_REG_WR_MASK;
- isp3_param_write(params_vdev, value, ISP3X_RAWAE_LITE_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_RAWAE_LITE_CTRL, id);
+ h_offs = arg->win.h_offs & ~0x1;
+ v_offs = arg->win.v_offs & ~0x1;
isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
- ISP3X_RAWAE_LITE_OFFSET);
+ ISP_PACK_2SHORT(h_offs, v_offs),
+ ISP3X_RAWAE_LITE_OFFSET, id);
- block_hsize = arg->win.h_size / ae_wnd_num[wnd_num_idx];
- value = block_hsize * ae_wnd_num[wnd_num_idx] + arg->win.h_offs;
- if (ispdev->hw_dev->is_unite)
+ if (ispdev->hw_dev->unite)
width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
- if (value + 1 > width)
- block_hsize -= 1;
- block_vsize = arg->win.v_size / ae_wnd_num[wnd_num_idx];
- value = block_vsize * ae_wnd_num[wnd_num_idx] + arg->win.v_offs;
- if (value + 2 > out_crop->height)
- block_vsize -= 1;
- if (block_vsize % 2)
- block_vsize -= 1;
+ h_size = arg->win.h_size;
+ v_size = arg->win.v_size;
+ if (!h_size || h_size + h_offs + 1 > width)
+ h_size = width - h_offs - 1;
+ if (!v_size || v_size + v_offs + 2 > height)
+ v_size = height - v_offs - 2;
+ block_hsize = (h_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
+ block_vsize = (v_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(block_hsize, block_vsize),
- ISP3X_RAWAE_LITE_BLK_SIZ);
+ ISP3X_RAWAE_LITE_BLK_SIZ, id);
- value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
+ value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
if ((value & ISP3X_RAWAE012_SEL(3)) != ISP3X_RAWAE012_SEL(arg->rawae_sel)) {
value &= ~(ISP3X_RAWAE012_SEL(3));
value |= ISP3X_RAWAE012_SEL(arg->rawae_sel);
- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
}
}
static void
-isp_rawaelite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawaelite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 exp_ctrl;
- exp_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL);
+ exp_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL, id);
exp_ctrl &= ~ISP32_REG_WR_MASK;
if (en)
exp_ctrl |= ISP3X_RAWAE_LITE_EN;
else
exp_ctrl &= ~ISP3X_RAWAE_LITE_EN;
- isp3_param_write(params_vdev, exp_ctrl, ISP3X_RAWAE_LITE_CTRL);
+ isp3_param_write(params_vdev, exp_ctrl, ISP3X_RAWAE_LITE_CTRL, id);
}
static void
isp_rawaebig_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_rawaebig_meas_cfg *arg,
- u32 blk_no)
+ u32 blk_no, u32 id)
{
struct rkisp_device *ispdev = params_vdev->dev;
struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
- u32 width = out_crop->width;
- u32 block_hsize, block_vsize;
- u32 addr, i, value, h_size, v_size;
- u32 wnd_num_idx = 0;
+ u32 width = out_crop->width, height = out_crop->height;
+ u32 addr, i, value, h_size, v_size, h_offs, v_offs;
+ u32 block_hsize, block_vsize, wnd_num_idx = 0;
const u32 ae_wnd_num[] = {
1, 5, 15, 15
};
@@ -1392,7 +1431,7 @@
}
/* avoid to override the old enable value */
- value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
+ value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
value &= ISP3X_RAWAE_BIG_EN;
wnd_num_idx = arg->wnd_num;
@@ -1408,59 +1447,65 @@
if (arg->subwin_en[3])
value |= ISP3X_RAWAE_BIG_WND4_EN;
}
- isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL);
+ isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL, id);
+ h_offs = arg->win.h_offs & ~0x1;
+ v_offs = arg->win.v_offs & ~0x1;
isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
- addr + ISP3X_RAWAE_BIG_OFFSET);
+ ISP_PACK_2SHORT(h_offs, v_offs),
+ addr + ISP3X_RAWAE_BIG_OFFSET, id);
- block_hsize = arg->win.h_size / ae_wnd_num[wnd_num_idx];
- value = block_hsize * ae_wnd_num[wnd_num_idx] + arg->win.h_offs;
- if (ispdev->hw_dev->is_unite)
+ if (ispdev->hw_dev->unite)
width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
- if (value + 1 > width)
- block_hsize -= 1;
- block_vsize = arg->win.v_size / ae_wnd_num[wnd_num_idx];
- value = block_vsize * ae_wnd_num[wnd_num_idx] + arg->win.v_offs;
- if (value + 2 > out_crop->height)
- block_vsize -= 1;
- if (block_vsize % 2)
- block_vsize -= 1;
+ h_size = arg->win.h_size;
+ v_size = arg->win.v_size;
+ if (!h_size || h_size + h_offs + 1 > width)
+ h_size = width - h_offs - 1;
+ if (!v_size || v_size + v_offs + 2 > height)
+ v_size = height - v_offs - 2;
+ block_hsize = (h_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
+ block_vsize = (v_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(block_hsize, block_vsize),
- addr + ISP3X_RAWAE_BIG_BLK_SIZE);
+ addr + ISP3X_RAWAE_BIG_BLK_SIZE, id);
for (i = 0; i < ISP32_RAWAEBIG_SUBWIN_NUM; i++) {
- isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->subwin[i].h_offs, arg->subwin[i].v_offs),
- addr + ISP3X_RAWAE_BIG_WND1_OFFSET + 8 * i);
+ h_offs = arg->subwin[i].h_offs & ~0x1;
+ v_offs = arg->subwin[i].v_offs & ~0x1;
+ isp3_param_write(params_vdev, ISP_PACK_2SHORT(h_offs, v_offs),
+ addr + ISP3X_RAWAE_BIG_WND1_OFFSET + 8 * i, id);
- v_size = arg->subwin[i].v_size + arg->subwin[i].v_offs;
- h_size = arg->subwin[i].h_size + arg->subwin[i].h_offs;
- isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(h_size, v_size),
- addr + ISP3X_RAWAE_BIG_WND1_SIZE + 8 * i);
+ v_size = arg->subwin[i].v_size;
+ h_size = arg->subwin[i].h_size;
+ if (!h_size || h_size + h_offs > width)
+ h_size = width - h_offs;
+ if (!v_size || v_size + v_offs > height)
+ v_size = height - v_offs;
+ h_size = (h_size + h_offs) & ~0x1;
+ v_size = (v_size + v_offs) & ~0x1;
+ isp3_param_write(params_vdev, ISP_PACK_2SHORT(h_size, v_size),
+ addr + ISP3X_RAWAE_BIG_WND1_SIZE + 8 * i, id);
}
- value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
+ value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
if (blk_no == 0) {
if ((value & ISP3X_RAWAE3_SEL(3)) != ISP3X_RAWAE3_SEL(arg->rawae_sel)) {
value &= ~(ISP3X_RAWAE3_SEL(3));
value |= ISP3X_RAWAE3_SEL(arg->rawae_sel);
- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
}
} else {
if ((value & ISP3X_RAWAE012_SEL(3)) != ISP3X_RAWAE012_SEL(arg->rawae_sel)) {
value &= ~(ISP3X_RAWAE012_SEL(3));
value |= ISP3X_RAWAE012_SEL(arg->rawae_sel);
- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
}
}
}
static void
isp_rawaebig_enable(struct rkisp_isp_params_vdev *params_vdev,
- bool en, u32 blk_no)
+ bool en, u32 blk_no, u32 id)
{
u32 exp_ctrl;
u32 addr;
@@ -1478,117 +1523,120 @@
break;
}
- exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
+ exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
exp_ctrl &= ~ISP32_REG_WR_MASK;
if (en)
exp_ctrl |= ISP32_MODULE_EN;
else
exp_ctrl &= ~ISP32_MODULE_EN;
- isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL);
+ isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL, id);
}
static void
isp_rawae1_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawaebig_meas_cfg *arg)
+ const struct isp2x_rawaebig_meas_cfg *arg, u32 id)
{
- isp_rawaebig_config(params_vdev, arg, 1);
+ isp_rawaebig_config(params_vdev, arg, 1, id);
}
static void
-isp_rawae1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawae1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- isp_rawaebig_enable(params_vdev, en, 1);
+ isp_rawaebig_enable(params_vdev, en, 1, id);
}
static void
isp_rawae2_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawaebig_meas_cfg *arg)
+ const struct isp2x_rawaebig_meas_cfg *arg, u32 id)
{
- isp_rawaebig_config(params_vdev, arg, 2);
+ isp_rawaebig_config(params_vdev, arg, 2, id);
}
static void
-isp_rawae2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawae2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- isp_rawaebig_enable(params_vdev, en, 2);
+ isp_rawaebig_enable(params_vdev, en, 2, id);
}
static void
isp_rawae3_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawaebig_meas_cfg *arg)
+ const struct isp2x_rawaebig_meas_cfg *arg, u32 id)
{
- isp_rawaebig_config(params_vdev, arg, 0);
+ isp_rawaebig_config(params_vdev, arg, 0, id);
}
static void
-isp_rawae3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawae3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- isp_rawaebig_enable(params_vdev, en, 0);
+ isp_rawaebig_enable(params_vdev, en, 0, id);
}
static void
isp_rawawb_cfg_sram(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_rawawb_meas_cfg *arg, bool is_check)
+ const struct isp32_rawawb_meas_cfg *arg, bool is_check, u32 id)
{
u32 i, val = ISP32_MODULE_EN;
if (params_vdev->dev->isp_ver == ISP_V32 && is_check &&
- !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL) & val))
+ !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL, id) & val))
return;
for (i = 0; i < ISP32_RAWAWB_WEIGHT_NUM / 5; i++) {
- isp3_param_write(params_vdev,
- (arg->wp_blk_wei_w[5 * i] & 0x3f) |
- (arg->wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 |
- (arg->wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 |
- (arg->wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 |
- (arg->wp_blk_wei_w[5 * i + 4] & 0x3f) << 24,
- ISP3X_RAWAWB_WRAM_DATA_BASE);
+ isp3_param_write_direct(params_vdev,
+ (arg->wp_blk_wei_w[5 * i] & 0x3f) |
+ (arg->wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 |
+ (arg->wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 |
+ (arg->wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 |
+ (arg->wp_blk_wei_w[5 * i + 4] & 0x3f) << 24,
+ ISP3X_RAWAWB_WRAM_DATA_BASE);
}
}
static void
isp_rawawb_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_rawawb_meas_cfg *arg)
+ const struct isp32_rawawb_meas_cfg *arg, u32 id)
{
- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
+ struct rkisp_device *dev = params_vdev->dev;
+ struct v4l2_rect *out_crop = &dev->isp_sdev.out_crop;
+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
struct isp32_rawawb_meas_cfg *arg_rec = ¶ms_rec->meas.rawawb;
const struct isp2x_bls_fixed_val *pval = &arg->bls2_val;
- u32 value, val, mask, i;
+ u32 width = out_crop->width, height = out_crop->height;
+ u32 value, val, mask, i, h_size, v_size, h_offs, v_offs;
- value = isp3_param_read(params_vdev, ISP3X_BLS_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_BLS_CTRL, id);
value &= ~ISP32_BLS_BLS2_EN;
if (arg->bls2_en) {
switch (params_vdev->raw_type) {
case RAW_BGGR:
- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_D_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_C_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_B_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_A_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_A_FIXED, id);
break;
case RAW_GBRG:
- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_C_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_D_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_A_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_B_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_B_FIXED, id);
break;
case RAW_GRBG:
- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_B_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_A_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_D_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_C_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_D_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_C_FIXED, id);
break;
case RAW_RGGB:
default:
- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_A_FIXED);
- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_B_FIXED);
- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_C_FIXED);
- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_D_FIXED);
+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_A_FIXED, id);
+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_B_FIXED, id);
+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_C_FIXED, id);
+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_D_FIXED, id);
}
value |= ISP32_BLS_BLS2_EN;
}
- isp3_param_write(params_vdev, value, ISP3X_BLS_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_BLS_CTRL, id);
value = arg->in_overexposure_threshold << 16 |
!!arg->blk_with_luma_wei_en << 8 |
@@ -1599,463 +1647,473 @@
!!arg->blk_measure_enable;
if (params_vdev->dev->isp_ver == ISP_V32_L)
value |= !!arg->ds16x8_mode_en << 7;
- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_BLK_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_BLK_CTRL, id);
- isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->h_offs, arg->v_offs),
- ISP3X_RAWAWB_WIN_OFFS);
+ h_offs = arg->h_offs & ~0x1;
+ v_offs = arg->v_offs & ~0x1;
isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->h_size, arg->v_size),
- ISP3X_RAWAWB_WIN_SIZE);
+ ISP_PACK_2SHORT(h_offs, v_offs),
+ ISP3X_RAWAWB_WIN_OFFS, id);
+
+ if (dev->hw_dev->unite)
+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
+ h_size = arg->h_size;
+ v_size = arg->v_size;
+ if (!h_size || h_size + h_offs > width)
+ h_size = width - h_offs;
+ if (!v_size || v_size + v_offs > height)
+ v_size = height - v_offs;
+ isp3_param_write(params_vdev,
+ ISP_PACK_2SHORT(h_size, v_size),
+ ISP3X_RAWAWB_WIN_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->r_max, arg->g_max),
- ISP3X_RAWAWB_LIMIT_RG_MAX);
+ ISP3X_RAWAWB_LIMIT_RG_MAX, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->b_max, arg->y_max),
- ISP3X_RAWAWB_LIMIT_BY_MAX);
+ ISP3X_RAWAWB_LIMIT_BY_MAX, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->r_min, arg->g_min),
- ISP3X_RAWAWB_LIMIT_RG_MIN);
+ ISP3X_RAWAWB_LIMIT_RG_MIN, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->b_min, arg->y_min),
- ISP3X_RAWAWB_LIMIT_BY_MIN);
+ ISP3X_RAWAWB_LIMIT_BY_MIN, id);
value = !!arg->wp_hist_xytype << 4 |
!!arg->wp_blk_wei_en1 << 3 |
!!arg->wp_blk_wei_en0 << 2 |
!!arg->wp_luma_wei_en1 << 1 |
!!arg->wp_luma_wei_en0;
- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_WEIGHT_CURVE_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_WEIGHT_CURVE_CTRL, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->wp_luma_weicurve_y0,
arg->wp_luma_weicurve_y1,
arg->wp_luma_weicurve_y2,
arg->wp_luma_weicurve_y3),
- ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR03);
+ ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR03, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->wp_luma_weicurve_y4,
arg->wp_luma_weicurve_y5,
arg->wp_luma_weicurve_y6,
arg->wp_luma_weicurve_y7),
- ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR47);
+ ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR47, id);
isp3_param_write(params_vdev,
arg->wp_luma_weicurve_y8,
- ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR8);
+ ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR8, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->wp_luma_weicurve_w0,
arg->wp_luma_weicurve_w1,
arg->wp_luma_weicurve_w2,
arg->wp_luma_weicurve_w3),
- ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR03);
+ ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR03, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->wp_luma_weicurve_w4,
arg->wp_luma_weicurve_w5,
arg->wp_luma_weicurve_w6,
arg->wp_luma_weicurve_w7),
- ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR47);
+ ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR47, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->wp_luma_weicurve_w8,
arg->pre_wbgain_inv_r),
- ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR8);
+ ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR8, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->pre_wbgain_inv_g,
arg->pre_wbgain_inv_b),
- ISP3X_RAWAWB_PRE_WBGAIN_INV);
+ ISP3X_RAWAWB_PRE_WBGAIN_INV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex0_u_0, arg->vertex0_v_0),
- ISP3X_RAWAWB_UV_DETC_VERTEX0_0);
+ ISP3X_RAWAWB_UV_DETC_VERTEX0_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex1_u_0, arg->vertex1_v_0),
- ISP3X_RAWAWB_UV_DETC_VERTEX1_0);
+ ISP3X_RAWAWB_UV_DETC_VERTEX1_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex2_u_0, arg->vertex2_v_0),
- ISP3X_RAWAWB_UV_DETC_VERTEX2_0);
+ ISP3X_RAWAWB_UV_DETC_VERTEX2_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex3_u_0, arg->vertex3_v_0),
- ISP3X_RAWAWB_UV_DETC_VERTEX3_0);
+ ISP3X_RAWAWB_UV_DETC_VERTEX3_0, id);
isp3_param_write(params_vdev, arg->islope01_0,
- ISP3X_RAWAWB_UV_DETC_ISLOPE01_0);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_0, id);
isp3_param_write(params_vdev, arg->islope12_0,
- ISP3X_RAWAWB_UV_DETC_ISLOPE12_0);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_0, id);
isp3_param_write(params_vdev, arg->islope23_0,
- ISP3X_RAWAWB_UV_DETC_ISLOPE23_0);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_0, id);
isp3_param_write(params_vdev, arg->islope30_0,
- ISP3X_RAWAWB_UV_DETC_ISLOPE30_0);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex0_u_1,
arg->vertex0_v_1),
- ISP3X_RAWAWB_UV_DETC_VERTEX0_1);
+ ISP3X_RAWAWB_UV_DETC_VERTEX0_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex1_u_1,
arg->vertex1_v_1),
- ISP3X_RAWAWB_UV_DETC_VERTEX1_1);
+ ISP3X_RAWAWB_UV_DETC_VERTEX1_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex2_u_1,
arg->vertex2_v_1),
- ISP3X_RAWAWB_UV_DETC_VERTEX2_1);
+ ISP3X_RAWAWB_UV_DETC_VERTEX2_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex3_u_1,
arg->vertex3_v_1),
- ISP3X_RAWAWB_UV_DETC_VERTEX3_1);
+ ISP3X_RAWAWB_UV_DETC_VERTEX3_1, id);
isp3_param_write(params_vdev, arg->islope01_1,
- ISP3X_RAWAWB_UV_DETC_ISLOPE01_1);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_1, id);
isp3_param_write(params_vdev, arg->islope12_1,
- ISP3X_RAWAWB_UV_DETC_ISLOPE12_1);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_1, id);
isp3_param_write(params_vdev, arg->islope23_1,
- ISP3X_RAWAWB_UV_DETC_ISLOPE23_1);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_1, id);
isp3_param_write(params_vdev, arg->islope30_1,
- ISP3X_RAWAWB_UV_DETC_ISLOPE30_1);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex0_u_2,
arg->vertex0_v_2),
- ISP3X_RAWAWB_UV_DETC_VERTEX0_2);
+ ISP3X_RAWAWB_UV_DETC_VERTEX0_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex1_u_2,
arg->vertex1_v_2),
- ISP3X_RAWAWB_UV_DETC_VERTEX1_2);
+ ISP3X_RAWAWB_UV_DETC_VERTEX1_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex2_u_2,
arg->vertex2_v_2),
- ISP3X_RAWAWB_UV_DETC_VERTEX2_2);
+ ISP3X_RAWAWB_UV_DETC_VERTEX2_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex3_u_2,
arg->vertex3_v_2),
- ISP3X_RAWAWB_UV_DETC_VERTEX3_2);
+ ISP3X_RAWAWB_UV_DETC_VERTEX3_2, id);
isp3_param_write(params_vdev, arg->islope01_2,
- ISP3X_RAWAWB_UV_DETC_ISLOPE01_2);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_2, id);
isp3_param_write(params_vdev, arg->islope12_2,
- ISP3X_RAWAWB_UV_DETC_ISLOPE12_2);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_2, id);
isp3_param_write(params_vdev, arg->islope23_2,
- ISP3X_RAWAWB_UV_DETC_ISLOPE23_2);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_2, id);
isp3_param_write(params_vdev, arg->islope30_2,
- ISP3X_RAWAWB_UV_DETC_ISLOPE30_2);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex0_u_3,
arg->vertex0_v_3),
- ISP3X_RAWAWB_UV_DETC_VERTEX0_3);
+ ISP3X_RAWAWB_UV_DETC_VERTEX0_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex1_u_3,
arg->vertex1_v_3),
- ISP3X_RAWAWB_UV_DETC_VERTEX1_3);
+ ISP3X_RAWAWB_UV_DETC_VERTEX1_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex2_u_3,
arg->vertex2_v_3),
- ISP3X_RAWAWB_UV_DETC_VERTEX2_3);
+ ISP3X_RAWAWB_UV_DETC_VERTEX2_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->vertex3_u_3,
arg->vertex3_v_3),
- ISP3X_RAWAWB_UV_DETC_VERTEX3_3);
+ ISP3X_RAWAWB_UV_DETC_VERTEX3_3, id);
isp3_param_write(params_vdev, arg->islope01_3,
- ISP3X_RAWAWB_UV_DETC_ISLOPE01_3);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_3, id);
isp3_param_write(params_vdev, arg->islope12_3,
- ISP3X_RAWAWB_UV_DETC_ISLOPE12_3);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_3, id);
isp3_param_write(params_vdev, arg->islope23_3,
- ISP3X_RAWAWB_UV_DETC_ISLOPE23_3);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_3, id);
isp3_param_write(params_vdev, arg->islope30_3,
- ISP3X_RAWAWB_UV_DETC_ISLOPE30_3);
+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->rgb2ryuvmat0_y,
arg->rgb2ryuvmat1_y),
- ISP3X_RAWAWB_YUV_RGB2ROTY_0);
+ ISP3X_RAWAWB_YUV_RGB2ROTY_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->rgb2ryuvmat2_y,
arg->rgb2ryuvofs_y),
- ISP3X_RAWAWB_YUV_RGB2ROTY_1);
+ ISP3X_RAWAWB_YUV_RGB2ROTY_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->rgb2ryuvmat0_u,
arg->rgb2ryuvmat1_u),
- ISP3X_RAWAWB_YUV_RGB2ROTU_0);
+ ISP3X_RAWAWB_YUV_RGB2ROTU_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->rgb2ryuvmat2_u,
arg->rgb2ryuvofs_u),
- ISP3X_RAWAWB_YUV_RGB2ROTU_1);
+ ISP3X_RAWAWB_YUV_RGB2ROTU_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->rgb2ryuvmat0_v,
arg->rgb2ryuvmat1_v),
- ISP3X_RAWAWB_YUV_RGB2ROTV_0);
+ ISP3X_RAWAWB_YUV_RGB2ROTV_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->rgb2ryuvmat2_v,
arg->rgb2ryuvofs_v),
- ISP3X_RAWAWB_YUV_RGB2ROTV_1);
+ ISP3X_RAWAWB_YUV_RGB2ROTV_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls0_y,
arg->vec_x21_ls0_y),
- ISP3X_RAWAWB_YUV_X_COOR_Y_0);
+ ISP3X_RAWAWB_YUV_X_COOR_Y_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls0_u,
arg->vec_x21_ls0_u),
- ISP3X_RAWAWB_YUV_X_COOR_U_0);
+ ISP3X_RAWAWB_YUV_X_COOR_U_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls0_v,
arg->vec_x21_ls0_v),
- ISP3X_RAWAWB_YUV_X_COOR_V_0);
+ ISP3X_RAWAWB_YUV_X_COOR_V_0, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->dis_x1x2_ls0, 0,
arg->rotu0_ls0, arg->rotu1_ls0),
- ISP3X_RAWAWB_YUV_X1X2_DIS_0);
+ ISP3X_RAWAWB_YUV_X1X2_DIS_0, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->rotu2_ls0, arg->rotu3_ls0,
arg->rotu4_ls0, arg->rotu5_ls0),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_0);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th0_ls0, arg->th1_ls0),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_0);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th2_ls0, arg->th3_ls0),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_0);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th4_ls0, arg->th5_ls0),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_0);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls1_y,
arg->vec_x21_ls1_y),
- ISP3X_RAWAWB_YUV_X_COOR_Y_1);
+ ISP3X_RAWAWB_YUV_X_COOR_Y_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls1_u,
arg->vec_x21_ls1_u),
- ISP3X_RAWAWB_YUV_X_COOR_U_1);
+ ISP3X_RAWAWB_YUV_X_COOR_U_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls1_v,
arg->vec_x21_ls1_v),
- ISP3X_RAWAWB_YUV_X_COOR_V_1);
+ ISP3X_RAWAWB_YUV_X_COOR_V_1, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->dis_x1x2_ls1, 0,
arg->rotu0_ls1, arg->rotu1_ls1),
- ISP3X_RAWAWB_YUV_X1X2_DIS_1);
+ ISP3X_RAWAWB_YUV_X1X2_DIS_1, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->rotu2_ls1, arg->rotu3_ls1,
arg->rotu4_ls1, arg->rotu5_ls1),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_1);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th0_ls1, arg->th1_ls1),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_1);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th2_ls1, arg->th3_ls1),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_1);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th4_ls1, arg->th5_ls1),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_1);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls2_y, arg->vec_x21_ls2_y),
- ISP3X_RAWAWB_YUV_X_COOR_Y_2);
+ ISP3X_RAWAWB_YUV_X_COOR_Y_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls2_u, arg->vec_x21_ls2_u),
- ISP3X_RAWAWB_YUV_X_COOR_U_2);
+ ISP3X_RAWAWB_YUV_X_COOR_U_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls2_v, arg->vec_x21_ls2_v),
- ISP3X_RAWAWB_YUV_X_COOR_V_2);
+ ISP3X_RAWAWB_YUV_X_COOR_V_2, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->dis_x1x2_ls2, 0,
arg->rotu0_ls2, arg->rotu1_ls2),
- ISP3X_RAWAWB_YUV_X1X2_DIS_2);
+ ISP3X_RAWAWB_YUV_X1X2_DIS_2, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->rotu2_ls2, arg->rotu3_ls2,
arg->rotu4_ls2, arg->rotu5_ls2),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_2);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th0_ls2, arg->th1_ls2),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_2);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th2_ls2, arg->th3_ls2),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_2);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th4_ls2, arg->th5_ls2),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_2);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls3_y,
arg->vec_x21_ls3_y),
- ISP3X_RAWAWB_YUV_X_COOR_Y_3);
+ ISP3X_RAWAWB_YUV_X_COOR_Y_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls3_u,
arg->vec_x21_ls3_u),
- ISP3X_RAWAWB_YUV_X_COOR_U_3);
+ ISP3X_RAWAWB_YUV_X_COOR_U_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->coor_x1_ls3_v,
arg->vec_x21_ls3_v),
- ISP3X_RAWAWB_YUV_X_COOR_V_3);
+ ISP3X_RAWAWB_YUV_X_COOR_V_3, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->dis_x1x2_ls3, 0,
arg->rotu0_ls3, arg->rotu1_ls3),
- ISP3X_RAWAWB_YUV_X1X2_DIS_3);
+ ISP3X_RAWAWB_YUV_X1X2_DIS_3, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->rotu2_ls3, arg->rotu3_ls3,
arg->rotu4_ls3, arg->rotu5_ls3),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_3);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th0_ls3, arg->th1_ls3),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_3);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th2_ls3, arg->th3_ls3),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_3);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->th4_ls3, arg->th5_ls3),
- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_3);
+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->wt0, arg->wt1),
- ISP3X_RAWAWB_RGB2XY_WT01);
+ ISP3X_RAWAWB_RGB2XY_WT01, id);
- isp3_param_write(params_vdev, arg->wt2,
- ISP3X_RAWAWB_RGB2XY_WT2);
+ isp3_param_write(params_vdev, arg->wt2, ISP3X_RAWAWB_RGB2XY_WT2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->mat0_x, arg->mat0_y),
- ISP3X_RAWAWB_RGB2XY_MAT0_XY);
+ ISP3X_RAWAWB_RGB2XY_MAT0_XY, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->mat1_x, arg->mat1_y),
- ISP3X_RAWAWB_RGB2XY_MAT1_XY);
+ ISP3X_RAWAWB_RGB2XY_MAT1_XY, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->mat2_x, arg->mat2_y),
- ISP3X_RAWAWB_RGB2XY_MAT2_XY);
+ ISP3X_RAWAWB_RGB2XY_MAT2_XY, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_x0_0, arg->nor_x1_0),
- ISP3X_RAWAWB_XY_DETC_NOR_X_0);
+ ISP3X_RAWAWB_XY_DETC_NOR_X_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_y0_0, arg->nor_y1_0),
- ISP3X_RAWAWB_XY_DETC_NOR_Y_0);
+ ISP3X_RAWAWB_XY_DETC_NOR_Y_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_x0_0, arg->big_x1_0),
- ISP3X_RAWAWB_XY_DETC_BIG_X_0);
+ ISP3X_RAWAWB_XY_DETC_BIG_X_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_y0_0, arg->big_y1_0),
- ISP3X_RAWAWB_XY_DETC_BIG_Y_0);
+ ISP3X_RAWAWB_XY_DETC_BIG_Y_0, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_x0_1, arg->nor_x1_1),
- ISP3X_RAWAWB_XY_DETC_NOR_X_1);
+ ISP3X_RAWAWB_XY_DETC_NOR_X_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_y0_1, arg->nor_y1_1),
- ISP3X_RAWAWB_XY_DETC_NOR_Y_1);
+ ISP3X_RAWAWB_XY_DETC_NOR_Y_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_x0_1, arg->big_x1_1),
- ISP3X_RAWAWB_XY_DETC_BIG_X_1);
+ ISP3X_RAWAWB_XY_DETC_BIG_X_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_y0_1, arg->big_y1_1),
- ISP3X_RAWAWB_XY_DETC_BIG_Y_1);
+ ISP3X_RAWAWB_XY_DETC_BIG_Y_1, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_x0_2, arg->nor_x1_2),
- ISP3X_RAWAWB_XY_DETC_NOR_X_2);
+ ISP3X_RAWAWB_XY_DETC_NOR_X_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_y0_2, arg->nor_y1_2),
- ISP3X_RAWAWB_XY_DETC_NOR_Y_2);
+ ISP3X_RAWAWB_XY_DETC_NOR_Y_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_x0_2, arg->big_x1_2),
- ISP3X_RAWAWB_XY_DETC_BIG_X_2);
+ ISP3X_RAWAWB_XY_DETC_BIG_X_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_y0_2, arg->big_y1_2),
- ISP3X_RAWAWB_XY_DETC_BIG_Y_2);
+ ISP3X_RAWAWB_XY_DETC_BIG_Y_2, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_x0_3, arg->nor_x1_3),
- ISP3X_RAWAWB_XY_DETC_NOR_X_3);
+ ISP3X_RAWAWB_XY_DETC_NOR_X_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->nor_y0_3, arg->nor_y1_3),
- ISP3X_RAWAWB_XY_DETC_NOR_Y_3);
+ ISP3X_RAWAWB_XY_DETC_NOR_Y_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_x0_3, arg->big_x1_3),
- ISP3X_RAWAWB_XY_DETC_BIG_X_3);
+ ISP3X_RAWAWB_XY_DETC_BIG_X_3, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->big_y0_3, arg->big_y1_3),
- ISP3X_RAWAWB_XY_DETC_BIG_Y_3);
+ ISP3X_RAWAWB_XY_DETC_BIG_Y_3, id);
value = (arg->exc_wp_region0_excen & 0x3) |
!!arg->exc_wp_region0_measen << 2 |
@@ -2076,138 +2134,138 @@
(arg->exc_wp_region6_excen & 0x3) << 24 |
!!arg->exc_wp_region6_domain << 27 |
!!arg->multiwindow_en << 31;
- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_MULTIWINDOW_EXC_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_MULTIWINDOW_EXC_CTRL, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow0_h_offs,
arg->multiwindow0_v_offs),
- ISP3X_RAWAWB_MULTIWINDOW0_OFFS);
+ ISP3X_RAWAWB_MULTIWINDOW0_OFFS, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow0_h_size,
arg->multiwindow0_v_size),
- ISP3X_RAWAWB_MULTIWINDOW0_SIZE);
+ ISP3X_RAWAWB_MULTIWINDOW0_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow1_h_offs,
arg->multiwindow1_v_offs),
- ISP3X_RAWAWB_MULTIWINDOW1_OFFS);
+ ISP3X_RAWAWB_MULTIWINDOW1_OFFS, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow1_h_size,
arg->multiwindow1_v_size),
- ISP3X_RAWAWB_MULTIWINDOW1_SIZE);
+ ISP3X_RAWAWB_MULTIWINDOW1_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow2_h_offs,
arg->multiwindow2_v_offs),
- ISP3X_RAWAWB_MULTIWINDOW2_OFFS);
+ ISP3X_RAWAWB_MULTIWINDOW2_OFFS, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow2_h_size,
arg->multiwindow2_v_size),
- ISP3X_RAWAWB_MULTIWINDOW2_SIZE);
+ ISP3X_RAWAWB_MULTIWINDOW2_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow3_h_offs,
arg->multiwindow3_v_offs),
- ISP3X_RAWAWB_MULTIWINDOW3_OFFS);
+ ISP3X_RAWAWB_MULTIWINDOW3_OFFS, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->multiwindow3_h_size,
arg->multiwindow3_v_size),
- ISP3X_RAWAWB_MULTIWINDOW3_SIZE);
+ ISP3X_RAWAWB_MULTIWINDOW3_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region0_xu0,
arg->exc_wp_region0_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION0_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION0_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region0_yv0,
arg->exc_wp_region0_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION0_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION0_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region1_xu0,
arg->exc_wp_region1_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION1_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION1_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region1_yv0,
arg->exc_wp_region1_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION1_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION1_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region2_xu0,
arg->exc_wp_region2_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION2_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION2_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region2_yv0,
arg->exc_wp_region2_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION2_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION2_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region3_xu0,
arg->exc_wp_region3_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION3_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION3_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region3_yv0,
arg->exc_wp_region3_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION3_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION3_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region4_xu0,
arg->exc_wp_region4_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION4_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION4_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region4_yv0,
arg->exc_wp_region4_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION4_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION4_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region5_xu0,
arg->exc_wp_region5_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION5_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION5_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region5_yv0,
arg->exc_wp_region5_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION5_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION5_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region6_xu0,
arg->exc_wp_region6_xu1),
- ISP3X_RAWAWB_EXC_WP_REGION6_XU);
+ ISP3X_RAWAWB_EXC_WP_REGION6_XU, id);
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(arg->exc_wp_region6_yv0,
arg->exc_wp_region6_yv1),
- ISP3X_RAWAWB_EXC_WP_REGION6_YV);
+ ISP3X_RAWAWB_EXC_WP_REGION6_YV, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->exc_wp_region0_weight,
arg->exc_wp_region1_weight,
arg->exc_wp_region2_weight,
arg->exc_wp_region3_weight),
- ISP32_RAWAWB_EXC_WP_WEIGHT0_3);
+ ISP32_RAWAWB_EXC_WP_WEIGHT0_3, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->exc_wp_region4_weight,
arg->exc_wp_region5_weight,
arg->exc_wp_region6_weight, 0),
- ISP32_RAWAWB_EXC_WP_WEIGHT4_6);
+ ISP32_RAWAWB_EXC_WP_WEIGHT4_6, id);
if (params_vdev->dev->isp_ver == ISP_V32) {
if (params_vdev->dev->hw_dev->is_single)
- isp_rawawb_cfg_sram(params_vdev, arg, false);
+ isp_rawawb_cfg_sram(params_vdev, arg, false, id);
else
memcpy(arg_rec->wp_blk_wei_w, arg->wp_blk_wei_w,
ISP32_RAWAWB_WEIGHT_NUM);
} else {
for (i = 0; i < ISP32L_RAWAWB_WEIGHT_NUM; i++)
isp3_param_write(params_vdev, arg->win_weight[i],
- ISP32L_RAWAWB_WIN_WEIGHT_0 + i * 4);
+ ISP32L_RAWAWB_WIN_WEIGHT_0 + i * 4, id);
}
/* avoid to override the old enable value */
- value = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL);
+ value = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL, id);
value &= (ISP32_MODULE_EN |
ISP32_RAWAWB_2DDR_PATH_EN |
ISP32_RAWAWB_2DDR_PATH_DS);
@@ -2227,45 +2285,46 @@
!!arg->yuv3d_en0 << 3 |
!!arg->xy_en0 << 2 |
!!arg->uv_en0 << 1;
- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_CTRL, id);
mask = ISP32_DRC2AWB_SEL | ISP32_BNR2AWB_SEL | ISP3X_RAWAWB_SEL(3);
val = ISP3X_RAWAWB_SEL(arg->rawawb_sel) |
(arg->bnr2awb_sel & 0x1) << 26 | (arg->drc2awb_sel & 0x1) << 27;
- value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
+ value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
if ((value & mask) != val) {
value &= ~mask;
value |= val;
- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
}
}
static void
-isp_rawawb_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawawb_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 awb_ctrl;
- awb_ctrl = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL);
+ awb_ctrl = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL, id);
awb_ctrl &= ~ISP32_REG_WR_MASK;
if (en)
awb_ctrl |= ISP32_MODULE_EN;
else
awb_ctrl &= ~ISP32_MODULE_EN;
- isp3_param_write(params_vdev, awb_ctrl, ISP3X_RAWAWB_CTRL);
+ isp3_param_write(params_vdev, awb_ctrl, ISP3X_RAWAWB_CTRL, id);
}
static void
isp_rawhstlite_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawhistlite_cfg *arg)
+ const struct isp2x_rawhistlite_cfg *arg, u32 id)
{
- u32 i;
- u32 value;
- u32 hist_ctrl;
- u32 block_hsize, block_vsize;
+ struct rkisp_device *ispdev = params_vdev->dev;
+ struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
+ u32 width = out_crop->width, height = out_crop->height;
+ u32 i, value, hist_ctrl, block_hsize, block_vsize;
+ u32 h_size, v_size, h_offs, v_offs;
/* avoid to override the old enable value */
- hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL);
+ hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL, id);
hist_ctrl &= ISP3X_RAWHIST_EN;
hist_ctrl = hist_ctrl |
ISP3X_RAWHIST_MODE(arg->mode) |
@@ -2273,23 +2332,31 @@
if (params_vdev->dev->isp_ver == ISP_V32)
hist_ctrl |= ISP3X_RAWHIST_DATASEL(arg->data_sel) |
ISP3X_RAWHIST_WATERLINE(arg->waterline);
- isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL);
+ isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL, id);
+ h_offs = arg->win.h_offs & ~0x1;
+ v_offs = arg->win.v_offs & ~0x1;
isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
- ISP3X_RAWHIST_LITE_OFFS);
+ ISP_PACK_2SHORT(h_offs, v_offs),
+ ISP3X_RAWHIST_LITE_OFFS, id);
- block_hsize = arg->win.h_size / ISP32_RAWHISTLITE_ROW_NUM - 1;
- block_vsize = arg->win.v_size / ISP32_RAWHISTLITE_COLUMN_NUM - 1;
- block_hsize &= 0xFFFE;
- block_vsize &= 0xFFFE;
+ if (ispdev->hw_dev->unite)
+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
+ h_size = arg->win.h_size;
+ v_size = arg->win.v_size;
+ if (!h_size || h_size + h_offs + 1 > width)
+ h_size = width - h_offs - 1;
+ if (!v_size || v_size + v_offs + 1 > height)
+ v_size = height - v_offs - 1;
+ block_hsize = (h_size / ISP32_RAWHISTLITE_ROW_NUM) & ~0x1;
+ block_vsize = (v_size / ISP32_RAWHISTLITE_COLUMN_NUM) & ~0x1;
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(block_hsize, block_vsize),
- ISP3X_RAWHIST_LITE_SIZE);
+ ISP3X_RAWHIST_LITE_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->rcc, arg->gcc, arg->bcc, arg->off),
- ISP3X_RAWHIST_LITE_RAW2Y_CC);
+ ISP3X_RAWHIST_LITE_RAW2Y_CC, id);
for (i = 0; i < (ISP32_RAWHISTLITE_WEIGHT_REG_SIZE / 4); i++) {
value = ISP_PACK_4BYTE(arg->weight[4 * i + 0],
@@ -2297,32 +2364,32 @@
arg->weight[4 * i + 2],
arg->weight[4 * i + 3]);
isp3_param_write(params_vdev, value,
- ISP3X_RAWHIST_LITE_WEIGHT + 4 * i);
+ ISP3X_RAWHIST_LITE_WEIGHT + 4 * i, id);
}
value = ISP_PACK_4BYTE(arg->weight[4 * i + 0], 0, 0, 0);
isp3_param_write(params_vdev, value,
- ISP3X_RAWHIST_LITE_WEIGHT + 4 * i);
+ ISP3X_RAWHIST_LITE_WEIGHT + 4 * i, id);
}
static void
-isp_rawhstlite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawhstlite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 hist_ctrl;
- hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL);
+ hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL, id);
hist_ctrl &= ~(ISP32_MODULE_EN | ISP32_REG_WR_MASK);
if (en)
hist_ctrl |= ISP32_MODULE_EN;
- isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL);
+ isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL, id);
}
static void
isp_rawhstbig_cfg_sram(struct rkisp_isp_params_vdev *params_vdev,
const struct isp2x_rawhistbig_cfg *arg,
- u32 blk_no, bool is_check)
+ u32 blk_no, bool is_check, u32 id)
{
u32 i, j, wnd_num_idx, value;
u8 weight15x15[ISP32_RAWHISTBIG_WEIGHT_REG_SIZE];
@@ -2344,7 +2411,7 @@
value = ISP3X_RAWHIST_EN;
if (is_check &&
- !(isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL) & value))
+ !(isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id) & value))
return;
wnd_num_idx = arg->wnd_num;
@@ -2369,13 +2436,16 @@
static void
isp_rawhstbig_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawhistbig_cfg *arg, u32 blk_no)
+ const struct isp2x_rawhistbig_cfg *arg, u32 blk_no, u32 id)
{
- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
struct rkisp_device *dev = params_vdev->dev;
+ struct v4l2_rect *out_crop = &dev->isp_sdev.out_crop;
+ u32 width = out_crop->width, height = out_crop->height;
struct isp2x_rawhistbig_cfg *arg_rec;
u32 hist_ctrl, block_hsize, block_vsize, wnd_num_idx;
const u32 hist_wnd_num[] = {5, 5, 15, 15};
+ u32 h_size, v_size, h_offs, v_offs;
u32 addr;
switch (blk_no) {
@@ -2396,7 +2466,7 @@
wnd_num_idx = arg->wnd_num;
/* avoid to override the old enable value */
- hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL);
+ hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id);
hist_ctrl &= ISP3X_RAWHIST_EN;
hist_ctrl = hist_ctrl |
ISP3X_RAWHIST_MODE(arg->mode) |
@@ -2405,33 +2475,41 @@
if (params_vdev->dev->isp_ver == ISP_V32)
hist_ctrl |= ISP3X_RAWHIST_DATASEL(arg->data_sel) |
ISP3X_RAWHIST_WATERLINE(arg->waterline);
- isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL);
+ isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL, id);
+ h_offs = arg->win.h_offs & ~0x1;
+ v_offs = arg->win.v_offs & ~0x1;
isp3_param_write(params_vdev,
- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
- addr + ISP3X_RAWHIST_BIG_OFFS);
+ ISP_PACK_2SHORT(h_offs, v_offs),
+ addr + ISP3X_RAWHIST_BIG_OFFS, id);
- block_hsize = arg->win.h_size / hist_wnd_num[wnd_num_idx] - 1;
- block_vsize = arg->win.v_size / hist_wnd_num[wnd_num_idx] - 1;
- block_hsize &= 0xFFFE;
- block_vsize &= 0xFFFE;
+ if (dev->hw_dev->unite)
+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
+ h_size = arg->win.h_size;
+ v_size = arg->win.v_size;
+ if (!h_size || h_size + h_offs + 1 > width)
+ h_size = width - h_offs - 1;
+ if (!v_size || v_size + v_offs + 1 > height)
+ v_size = height - v_offs - 1;
+ block_hsize = (h_size / hist_wnd_num[wnd_num_idx]) & ~0x1;
+ block_vsize = (v_size / hist_wnd_num[wnd_num_idx]) & ~0x1;
isp3_param_write(params_vdev,
ISP_PACK_2SHORT(block_hsize, block_vsize),
- addr + ISP3X_RAWHIST_BIG_SIZE);
+ addr + ISP3X_RAWHIST_BIG_SIZE, id);
isp3_param_write(params_vdev,
ISP_PACK_4BYTE(arg->rcc, arg->gcc, arg->bcc, arg->off),
- addr + ISP3X_RAWHIST_BIG_RAW2Y_CC);
+ addr + ISP3X_RAWHIST_BIG_RAW2Y_CC, id);
if (dev->hw_dev->is_single)
- isp_rawhstbig_cfg_sram(params_vdev, arg, blk_no, false);
+ isp_rawhstbig_cfg_sram(params_vdev, arg, blk_no, false, id);
else
*arg_rec = *arg;
}
static void
isp_rawhstbig_enable(struct rkisp_isp_params_vdev *params_vdev,
- bool en, u32 blk_no)
+ bool en, u32 blk_no, u32 id)
{
u32 hist_ctrl;
u32 addr;
@@ -2449,72 +2527,72 @@
break;
}
- hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL);
+ hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id);
hist_ctrl &= ~(ISP3X_RAWHIST_EN | ISP32_REG_WR_MASK);
if (en)
hist_ctrl |= ISP3X_RAWHIST_EN;
- isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL);
+ isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL, id);
}
static void
isp_rawhst1_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawhistbig_cfg *arg)
+ const struct isp2x_rawhistbig_cfg *arg, u32 id)
{
- isp_rawhstbig_config(params_vdev, arg, 1);
+ isp_rawhstbig_config(params_vdev, arg, 1, id);
}
static void
-isp_rawhst1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawhst1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- isp_rawhstbig_enable(params_vdev, en, 1);
+ isp_rawhstbig_enable(params_vdev, en, 1, id);
}
static void
isp_rawhst2_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawhistbig_cfg *arg)
+ const struct isp2x_rawhistbig_cfg *arg, u32 id)
{
- isp_rawhstbig_config(params_vdev, arg, 2);
+ isp_rawhstbig_config(params_vdev, arg, 2, id);
}
static void
-isp_rawhst2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawhst2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- isp_rawhstbig_enable(params_vdev, en, 2);
+ isp_rawhstbig_enable(params_vdev, en, 2, id);
}
static void
isp_rawhst3_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_rawhistbig_cfg *arg)
+ const struct isp2x_rawhistbig_cfg *arg, u32 id)
{
- isp_rawhstbig_config(params_vdev, arg, 0);
+ isp_rawhstbig_config(params_vdev, arg, 0, id);
}
static void
-isp_rawhst3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_rawhst3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
- isp_rawhstbig_enable(params_vdev, en, 0);
+ isp_rawhstbig_enable(params_vdev, en, 0, id);
}
static void
isp_hdrmge_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp32_hdrmge_cfg *arg,
- enum rkisp_params_type type)
+ enum rkisp_params_type type, u32 id)
{
u32 value;
int i;
if (type == RKISP_PARAMS_SHD || type == RKISP_PARAMS_ALL) {
value = ISP_PACK_2SHORT(arg->gain0, arg->gain0_inv);
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN0);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN0, id);
value = ISP_PACK_2SHORT(arg->gain1, arg->gain1_inv);
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN1);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN1, id);
value = arg->gain2;
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN2);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN2, id);
- value = isp3_param_read_cache(params_vdev, ISP3X_HDRMGE_CTRL);
+ value = isp3_param_read_cache(params_vdev, ISP3X_HDRMGE_CTRL, id);
if (arg->s_base)
value |= BIT(1);
else
@@ -2523,48 +2601,48 @@
value |= BIT(6);
else
value &= ~BIT(6);
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_CTRL, id);
}
if (type == RKISP_PARAMS_IMD || type == RKISP_PARAMS_ALL) {
value = ISP_PACK_4BYTE(arg->ms_dif_0p8, arg->ms_diff_0p15,
arg->lm_dif_0p9, arg->lm_dif_0p15);
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LIGHTZ);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LIGHTZ, id);
value = (arg->ms_scl & 0x7ff) |
(arg->ms_thd0 & 0x3ff) << 12 |
(arg->ms_thd1 & 0x3ff) << 22;
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_MS_DIFF);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_MS_DIFF, id);
value = (arg->lm_scl & 0x7ff) |
(arg->lm_thd0 & 0x3ff) << 12 |
(arg->lm_thd1 & 0x3ff) << 22;
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LM_DIFF);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LM_DIFF, id);
for (i = 0; i < ISP32_HDRMGE_L_CURVE_NUM; i++) {
value = ISP_PACK_2SHORT(arg->curve.curve_0[i], arg->curve.curve_1[i]);
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_DIFF_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_DIFF_Y0 + 4 * i, id);
}
for (i = 0; i < ISP32_HDRMGE_E_CURVE_NUM; i++) {
value = (arg->l_raw1[i] & 0x3ff) << 20 |
(arg->l_raw0[i] & 0x3ff) << 10 |
(arg->e_y[i] & 0x3ff);
- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_OVER_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_OVER_Y0 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->each_raw_gain0, arg->each_raw_gain1);
- isp3_param_write(params_vdev, value, ISP32_HDRMGE_EACH_GAIN);
+ isp3_param_write(params_vdev, value, ISP32_HDRMGE_EACH_GAIN, id);
}
}
static void
-isp_hdrmge_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_hdrmge_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
}
static void
isp_hdrdrc_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp32_drc_cfg *arg,
- enum rkisp_params_type type)
+ enum rkisp_params_type type, u32 id)
{
u32 i, value;
@@ -2574,76 +2652,76 @@
value = (arg->offset_pow2 & 0x0F) << 28 |
(arg->compres_scl & 0x1FFF) << 14 |
(arg->position & 0x03FFF);
- isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL1);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL1, id);
value = arg->delta_scalein << 24 |
(arg->hpdetail_ratio & 0xFFF) << 12 |
(arg->lpdetail_ratio & 0xFFF);
- isp3_param_write(params_vdev, value, ISP3X_DRC_LPRATIO);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_LPRATIO, id);
value = ISP_PACK_4BYTE(arg->bilat_wt_off, 0, arg->weipre_frame, arg->weicur_pix);
- isp3_param_write(params_vdev, value, ISP3X_DRC_EXPLRATIO);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_EXPLRATIO, id);
value = (arg->force_sgm_inv0 & 0xFFFF) << 16 |
arg->motion_scl << 8 | arg->edge_scl;
- isp3_param_write(params_vdev, value, ISP3X_DRC_SIGMA);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_SIGMA, id);
value = ISP_PACK_2SHORT(arg->space_sgm_inv0, arg->space_sgm_inv1);
- isp3_param_write(params_vdev, value, ISP3X_DRC_SPACESGM);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_SPACESGM, id);
value = ISP_PACK_2SHORT(arg->range_sgm_inv0, arg->range_sgm_inv1);
- isp3_param_write(params_vdev, value, ISP3X_DRC_RANESGM);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_RANESGM, id);
value = (arg->weig_bilat & 0x1f) | (arg->weig_maxl & 0x1f) << 8 |
(arg->bilat_soft_thd & 0x3fff) << 16;
if (arg->enable_soft_thd)
value |= BIT(31);
- isp3_param_write(params_vdev, value, ISP3X_DRC_BILAT);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_BILAT, id);
for (i = 0; i < ISP32_DRC_Y_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->gain_y[2 * i],
arg->gain_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->gain_y[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i, id);
for (i = 0; i < ISP32_DRC_Y_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->compres_y[2 * i],
arg->compres_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->compres_y[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i, id);
for (i = 0; i < ISP32_DRC_Y_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->scale_y[2 * i],
arg->scale_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->scale_y[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i, id);
if (params_vdev->dev->isp_ver == ISP_V32)
value = ISP_PACK_2SHORT(arg->min_ogain, arg->iir_weight);
else
value = ISP_PACK_2SHORT(arg->min_ogain, 0);
- isp3_param_write(params_vdev, value, ISP3X_DRC_IIRWG_GAIN);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_IIRWG_GAIN, id);
value = arg->gas_t & 0x1fff;
- isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_CTRL);
+ isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_CTRL, id);
value = ISP_PACK_4BYTE(arg->gas_l0, arg->gas_l1, arg->gas_l2, arg->gas_l3);
- isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_GAS);
+ isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_GAS, id);
}
static void
-isp_hdrdrc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_hdrdrc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
bool real_en;
- value = isp3_param_read(params_vdev, ISP3X_DRC_CTRL0);
+ value = isp3_param_read(params_vdev, ISP3X_DRC_CTRL0, id);
real_en = !!(value & ISP32_MODULE_EN);
if ((en && real_en) || (!en && !real_en))
return;
@@ -2651,17 +2729,17 @@
if (en) {
value |= ISP32_MODULE_EN;
isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
- ISP3X_ADRC_FST_FRAME);
+ ISP3X_ADRC_FST_FRAME, id);
} else {
value = 0;
- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(12));
+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(12), id);
}
- isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL0);
+ isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL0, id);
}
static void
isp_gic_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp21_gic_cfg *arg)
+ const struct isp21_gic_cfg *arg, u32 id)
{
u32 value;
s32 i;
@@ -2669,12 +2747,12 @@
value = (arg->regmingradthrdark2 & 0x03FF) << 20 |
(arg->regmingradthrdark1 & 0x03FF) << 10 |
(arg->regminbusythre & 0x03FF);
- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA1);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA1, id);
value = (arg->regdarkthre & 0x07FF) << 21 |
(arg->regmaxcorvboth & 0x03FF) << 11 |
(arg->regdarktthrehi & 0x07FF);
- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA2);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA2, id);
value = (arg->regkgrad2dark & 0x0F) << 28 |
(arg->regkgrad1dark & 0x0F) << 24 |
@@ -2683,46 +2761,46 @@
(arg->regkgrad2 & 0x0F) << 8 |
(arg->regkgrad1 & 0x0F) << 4 |
(arg->reggbthre & 0x0F);
- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA3);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA3, id);
value = (arg->regmaxcorv & 0x03FF) << 20 |
(arg->regmingradthr2 & 0x03FF) << 10 |
(arg->regmingradthr1 & 0x03FF);
- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA4);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA4, id);
value = (arg->gr_ratio & 0x03) << 28 |
(arg->noise_scale & 0x7F) << 12 |
(arg->noise_base & 0xFFF);
- isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA1);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA1, id);
value = arg->diff_clip & 0x7fff;
- isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA2);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA2, id);
for (i = 0; i < ISP32_GIC_SIGMA_Y_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->sigma_y[2 * i], arg->sigma_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->sigma_y[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i, id);
}
static void
-isp_gic_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_gic_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value = 0;
if (en)
value |= ISP32_MODULE_EN;
- isp3_param_write(params_vdev, value, ISP3X_GIC_CONTROL);
+ isp3_param_write(params_vdev, value, ISP3X_GIC_CONTROL, id);
}
static void
isp_dhaz_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_dhaz_cfg *arg)
+ const struct isp32_dhaz_cfg *arg, u32 id)
{
u32 i, value, ctrl;
- ctrl = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL);
+ ctrl = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL, id);
ctrl &= ISP3X_DHAZ_ENMUX;
ctrl |= !!arg->enh_luma_en << 28 | !!arg->color_deviate_en << 27 |
@@ -2736,109 +2814,109 @@
value = (arg->hist_wr[i * 3] & 0x3ff) |
(arg->hist_wr[i * 3 + 1] & 0x3ff) << 10 |
(arg->hist_wr[i * 3 + 2] & 0x3ff) << 20;
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4, id);
}
value = arg->hist_wr[i * 3] & 0x3ff;
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4, id);
}
- isp3_param_write(params_vdev, ctrl, ISP3X_DHAZ_CTRL);
+ isp3_param_write(params_vdev, ctrl, ISP3X_DHAZ_CTRL, id);
value = ISP_PACK_4BYTE(arg->dc_min_th, arg->dc_max_th,
arg->yhist_th, arg->yblk_th);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP0);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP0, id);
value = ISP_PACK_4BYTE(arg->bright_min, arg->bright_max,
arg->wt_max, 0);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP1);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP1, id);
value = ISP_PACK_4BYTE(arg->air_min, arg->air_max,
arg->dark_th, arg->tmax_base);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP2);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP2, id);
value = ISP_PACK_2SHORT(arg->tmax_off, arg->tmax_max);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_TMAX);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_TMAX, id);
value = (arg->hist_min & 0xFFFF) << 16 |
(arg->hist_th_off & 0xFF) << 8 |
(arg->hist_k & 0x1F);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST0);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST0, id);
value = ISP_PACK_2SHORT(arg->hist_scale, arg->hist_gratio);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST1);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST1, id);
value = ISP_PACK_2SHORT(arg->enhance_chroma, arg->enhance_value);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENHANCE);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENHANCE, id);
value = (arg->iir_wt_sigma & 0x07FF) << 16 |
(arg->iir_sigma & 0xFF) << 8 |
(arg->stab_fnum & 0x1F);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR0);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR0, id);
value = (arg->iir_pre_wet & 0x0F) << 24 |
(arg->iir_tmax_sigma & 0x7FF) << 8 |
(arg->iir_air_sigma & 0xFF);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR1);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR1, id);
value = (arg->cfg_wt & 0x01FF) << 16 |
(arg->cfg_air & 0xFF) << 8 |
(arg->cfg_alpha & 0xFF);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG0);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG0, id);
value = ISP_PACK_2SHORT(arg->cfg_tmax, arg->cfg_gratio);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG1);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG1, id);
value = (arg->range_sima & 0x01FF) << 16 |
(arg->space_sigma_pre & 0xFF) << 8 |
(arg->space_sigma_cur & 0xFF);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_SIGMA);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_SIGMA, id);
value = ISP_PACK_2SHORT(arg->bf_weight, arg->dc_weitcur);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_WET);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_WET, id);
for (i = 0; i < ISP32_DHAZ_ENH_CURVE_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->enh_curve[2 * i], arg->enh_curve[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->enh_curve[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i, id);
value = ISP_PACK_4BYTE(arg->gaus_h0, arg->gaus_h1, arg->gaus_h2, 0);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAUS);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAUS, id);
for (i = 0; i < ISP32_DHAZ_SIGMA_IDX_NUM / 4; i++) {
value = ISP_PACK_4BYTE(arg->sigma_idx[i * 4], arg->sigma_idx[i * 4 + 1],
arg->sigma_idx[i * 4 + 2], arg->sigma_idx[i * 4 + 3]);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4, id);
}
value = ISP_PACK_4BYTE(arg->sigma_idx[i * 4], arg->sigma_idx[i * 4 + 1],
arg->sigma_idx[i * 4 + 2], 0);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4, id);
for (i = 0; i < ISP32_DHAZ_SIGMA_LUT_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->sigma_lut[i * 2], arg->sigma_lut[i * 2 + 1]);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4, id);
}
value = ISP_PACK_2SHORT(arg->sigma_lut[i * 2], 0);
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4, id);
for (i = 0; i < ISP32_DHAZ_ENH_LUMA_NUM / 3; i++) {
value = (arg->enh_luma[i * 3 + 2] & 0x3ff) << 20 |
(arg->enh_luma[i * 3 + 1] & 0x3ff) << 10 |
(arg->enh_luma[i * 3] & 0x3ff);
- isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4, id);
}
value = (arg->enh_luma[i * 3 + 1] & 0x3ff) << 10 |
(arg->enh_luma[i * 3] & 0x3ff);
- isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4, id);
}
static void
-isp_dhaz_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_dhaz_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
bool real_en;
- value = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL, id);
real_en = !!(value & ISP3X_DHAZ_ENMUX);
if ((en && real_en) || (!en && !real_en))
return;
@@ -2846,17 +2924,17 @@
if (en) {
value |= ISP32_SELF_FORCE_UPD | ISP3X_DHAZ_ENMUX;
isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
- ISP3X_DHAZ_FST_FRAME);
+ ISP3X_DHAZ_FST_FRAME, id);
} else {
value &= ~ISP3X_DHAZ_ENMUX;
- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(16));
+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(16), id);
}
- isp3_param_write(params_vdev, value, ISP3X_DHAZ_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_CTRL, id);
}
static void
isp_3dlut_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp2x_3dlut_cfg *arg)
+ const struct isp2x_3dlut_cfg *arg, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
@@ -2864,58 +2942,58 @@
u32 *data;
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
- buf_idx = (priv_val->buf_3dlut_idx++) % ISP32_3DLUT_BUF_NUM;
+ buf_idx = (priv_val->buf_3dlut_idx[id]++) % ISP32_3DLUT_BUF_NUM;
- if (!priv_val->buf_3dlut[buf_idx].vaddr) {
+ if (!priv_val->buf_3dlut[id][buf_idx].vaddr) {
dev_err(dev->dev, "no find 3dlut buf\n");
return;
}
- data = (u32 *)priv_val->buf_3dlut[buf_idx].vaddr;
+ data = (u32 *)priv_val->buf_3dlut[id][buf_idx].vaddr;
for (i = 0; i < arg->actual_size; i++)
data[i] = (arg->lut_b[i] & 0x3FF) |
(arg->lut_g[i] & 0xFFF) << 10 |
(arg->lut_r[i] & 0x3FF) << 22;
- rkisp_prepare_buffer(params_vdev->dev, &priv_val->buf_3dlut[buf_idx]);
- value = priv_val->buf_3dlut[buf_idx].dma_addr;
- isp3_param_write(params_vdev, value, ISP3X_MI_LUT_3D_RD_BASE);
- isp3_param_write(params_vdev, arg->actual_size, ISP3X_MI_LUT_3D_RD_WSIZE);
+ rkisp_prepare_buffer(params_vdev->dev, &priv_val->buf_3dlut[id][buf_idx]);
+ value = priv_val->buf_3dlut[id][buf_idx].dma_addr;
+ isp3_param_write(params_vdev, value, ISP3X_MI_LUT_3D_RD_BASE, id);
+ isp3_param_write(params_vdev, arg->actual_size, ISP3X_MI_LUT_3D_RD_WSIZE, id);
- value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL, id);
value &= ISP3X_3DLUT_EN;
if (value)
- isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
+ isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
- isp3_param_write(params_vdev, value, ISP3X_3DLUT_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_3DLUT_CTRL, id);
}
static void
-isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
bool en_state;
struct rkisp_isp_params_val_v32 *priv_val;
- value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL, id);
en_state = (value & ISP3X_3DLUT_EN) ? true : false;
if (en == en_state)
return;
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
- if (en && priv_val->buf_3dlut[0].vaddr) {
- isp3_param_set_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01);
- isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
+ if (en && priv_val->buf_3dlut[id][0].vaddr) {
+ isp3_param_set_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01, id);
+ isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
} else {
- isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01);
- isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(20));
+ isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01, id);
+ isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(20), id);
}
}
static void
isp_ldch_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_ldch_cfg *arg)
+ const struct isp32_ldch_cfg *arg, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
@@ -2923,7 +3001,7 @@
int buf_idx, i;
u32 value;
- value = isp3_param_read(params_vdev, ISP3X_LDCH_STS);
+ value = isp3_param_read(params_vdev, ISP3X_LDCH_STS, id);
value &= ISP32_MODULE_EN;
value |= !!arg->map13p3_en << 7 |
!!arg->force_map_en << 6 |
@@ -2931,20 +3009,20 @@
!!arg->sample_avr_en << 3 |
!!arg->zero_interp_en << 2 |
!!arg->frm_end_dis << 1;
- isp3_param_write(params_vdev, value, ISP3X_LDCH_STS);
+ isp3_param_write(params_vdev, value, ISP3X_LDCH_STS, id);
if (arg->bic_mode_en) {
for (i = 0; i < ISP32_LDCH_BIC_NUM / 4; i++) {
value = ISP_PACK_4BYTE(arg->bicubic[i * 4], arg->bicubic[i * 4 + 1],
arg->bicubic[i * 4 + 2], arg->bicubic[i * 4 + 3]);
- isp3_param_write(params_vdev, value, ISP32_LDCH_BIC_TABLE0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_LDCH_BIC_TABLE0 + i * 4, id);
}
}
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
- if (!priv_val->buf_ldch[i].mem_priv)
+ if (!priv_val->buf_ldch[id][i].mem_priv)
continue;
- if (arg->buf_fd == priv_val->buf_ldch[i].dma_fd)
+ if (arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd)
break;
}
if (i == ISP32_MESH_BUF_NUM) {
@@ -2952,28 +3030,28 @@
return;
}
- if (!priv_val->buf_ldch[i].vaddr) {
+ if (!priv_val->buf_ldch[id][i].vaddr) {
dev_err(dev->dev, "no ldch buffer allocated\n");
return;
}
- buf_idx = priv_val->buf_ldch_idx;
- head = (struct isp2x_mesh_head *)priv_val->buf_ldch[buf_idx].vaddr;
+ buf_idx = priv_val->buf_ldch_idx[id];
+ head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][buf_idx].vaddr;
head->stat = MESH_BUF_INIT;
buf_idx = i;
- head = (struct isp2x_mesh_head *)priv_val->buf_ldch[buf_idx].vaddr;
+ head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][buf_idx].vaddr;
head->stat = MESH_BUF_CHIPINUSE;
- priv_val->buf_ldch_idx = buf_idx;
- rkisp_prepare_buffer(dev, &priv_val->buf_ldch[buf_idx]);
- value = priv_val->buf_ldch[buf_idx].dma_addr + head->data_oft;
- isp3_param_write(params_vdev, value, ISP3X_MI_LUT_LDCH_RD_BASE);
- isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_LDCH_RD_H_WSIZE);
- isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_LDCH_RD_V_SIZE);
+ priv_val->buf_ldch_idx[id] = buf_idx;
+ rkisp_prepare_buffer(dev, &priv_val->buf_ldch[id][buf_idx]);
+ value = priv_val->buf_ldch[id][buf_idx].dma_addr + head->data_oft;
+ isp3_param_write(params_vdev, value, ISP3X_MI_LUT_LDCH_RD_BASE, id);
+ isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_LDCH_RD_H_WSIZE, id);
+ isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_LDCH_RD_V_SIZE, id);
}
static void
-isp_ldch_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_ldch_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
@@ -2981,24 +3059,24 @@
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
if (en) {
- buf_idx = priv_val->buf_ldch_idx;
- if (!priv_val->buf_ldch[buf_idx].vaddr) {
+ buf_idx = priv_val->buf_ldch_idx[id];
+ if (!priv_val->buf_ldch[id][buf_idx].vaddr) {
dev_err(dev->dev, "no ldch buffer allocated\n");
return;
}
- isp3_param_set_bits(params_vdev, ISP3X_LDCH_STS, 0x01);
+ isp3_param_set_bits(params_vdev, ISP3X_LDCH_STS, 0x01, id);
} else {
- isp3_param_clear_bits(params_vdev, ISP3X_LDCH_STS, 0x01);
+ isp3_param_clear_bits(params_vdev, ISP3X_LDCH_STS, 0x01, id);
}
}
static void
isp_ynr_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_ynr_cfg *arg)
+ const struct isp32_ynr_cfg *arg, u32 id)
{
u32 i, value;
- value = isp3_param_read(params_vdev, ISP3X_YNR_GLOBAL_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_YNR_GLOBAL_CTRL, id);
value &= ISP32_MODULE_EN;
value |= !!arg->rnr_en << 26 |
@@ -3011,96 +3089,96 @@
!!arg->lgft3x3_bypass << 3 |
!!arg->lbft5x5_bypass << 2 |
!!arg->bft3x3_bypass << 1;
- isp3_param_write(params_vdev, value, ISP3X_YNR_GLOBAL_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_GLOBAL_CTRL, id);
value = ISP_PACK_2SHORT(arg->rnr_max_r, arg->local_gainscale);
- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_MAX_R);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_MAX_R, id);
value = ISP_PACK_2SHORT(arg->rnr_center_coorh, arg->rnr_center_coorv);
- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_CENTER_COOR);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_CENTER_COOR, id);
value = ISP_PACK_2SHORT(arg->loclagain_adj_thresh, arg->localgain_adj);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LOCAL_GAIN_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOCAL_GAIN_CTRL, id);
value = ISP_PACK_2SHORT(arg->low_bf_inv0, arg->low_bf_inv1);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL0);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL0, id);
value = ISP_PACK_2SHORT(arg->low_thred_adj, arg->low_peak_supress);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL1);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL1, id);
value = ISP_PACK_2SHORT(arg->low_edge_adj_thresh, arg->low_dist_adj);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL2);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL2, id);
value = (arg->low_bi_weight & 0xFF) << 24 |
(arg->low_weight & 0xFF) << 16 |
(arg->low_center_weight & 0xFFFF);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL3);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL3, id);
value = ISP_PACK_2SHORT(arg->lbf_weight_thres, arg->frame_full_size);
if (params_vdev->dev->isp_ver == ISP_V32_L)
value |= (arg->frame_add4line & 0xf) << 12;
- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL4);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL4, id);
value = (arg->low_gauss1_coeff2 & 0xFFFF) << 16 |
(arg->low_gauss1_coeff1 & 0xFF) << 8 |
(arg->low_gauss1_coeff0 & 0xFF);
- isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS1_COEFF);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS1_COEFF, id);
value = (arg->low_gauss2_coeff2 & 0xFFFF) << 16 |
(arg->low_gauss2_coeff1 & 0xFF) << 8 |
(arg->low_gauss2_coeff0 & 0xFF);
- isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS2_COEFF);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS2_COEFF, id);
for (i = 0; i < ISP32_YNR_XY_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->luma_points_x[2 * i],
arg->luma_points_x[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->luma_points_x[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i, id);
for (i = 0; i < ISP32_YNR_XY_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->lsgm_y[2 * i],
arg->lsgm_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i, id);
}
value = ISP_PACK_2SHORT(arg->lsgm_y[2 * i], 0);
- isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i, id);
for (i = 0; i < ISP32_YNR_XY_NUM / 4; i++) {
value = ISP_PACK_4BYTE(arg->rnr_strength3[4 * i],
arg->rnr_strength3[4 * i + 1],
arg->rnr_strength3[4 * i + 2],
arg->rnr_strength3[4 * i + 3]);
- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i, id);
}
value = ISP_PACK_4BYTE(arg->rnr_strength3[4 * i], 0, 0, 0);
- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i, id);
value = (arg->nlm_hi_bf_scale & 0x3ff) << 16 |
(arg->nlm_hi_gain_alpha & 0x1f) << 11 |
(arg->nlm_min_sigma & 0x7ff);
- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_SIGMA_GAIN);
+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_SIGMA_GAIN, id);
value = (arg->nlm_coe[5] & 0xf) << 20 | (arg->nlm_coe[4] & 0xf) << 16 |
(arg->nlm_coe[3] & 0xf) << 12 | (arg->nlm_coe[2] & 0xf) << 8 |
(arg->nlm_coe[1] & 0xf) << 4 | (arg->nlm_coe[0] & 0xf);
- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_COE);
+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_COE, id);
value = (arg->nlm_center_weight & 0x3ffff) << 10 | (arg->nlm_weight_offset & 0x3ff);
- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_WEIGHT);
+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_WEIGHT, id);
value = arg->nlm_nr_weight & 0x7ff;
- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_NR_WEIGHT);
+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_NR_WEIGHT, id);
}
static void
-isp_ynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_ynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 ynr_ctrl;
bool real_en;
- ynr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_YNR_GLOBAL_CTRL);
+ ynr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_YNR_GLOBAL_CTRL, id);
real_en = !!(ynr_ctrl & ISP32_MODULE_EN);
if ((en && real_en) || (!en && !real_en))
return;
@@ -3108,22 +3186,22 @@
if (en) {
ynr_ctrl |= ISP32_MODULE_EN;
isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
- ISP3X_YNR_FST_FRAME);
+ ISP3X_YNR_FST_FRAME, id);
} else {
ynr_ctrl &= ~ISP32_MODULE_EN;
}
- isp3_param_write(params_vdev, ynr_ctrl, ISP3X_YNR_GLOBAL_CTRL);
+ isp3_param_write(params_vdev, ynr_ctrl, ISP3X_YNR_GLOBAL_CTRL, id);
}
static void
isp_cnr_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_cnr_cfg *arg)
+ const struct isp32_cnr_cfg *arg, u32 id)
{
u32 i, value, ctrl, gain_ctrl;
- gain_ctrl = isp3_param_read(params_vdev, ISP3X_GAIN_CTRL);
- ctrl = isp3_param_read(params_vdev, ISP3X_CNR_CTRL);
+ gain_ctrl = isp3_param_read(params_vdev, ISP3X_GAIN_CTRL, id);
+ ctrl = isp3_param_read(params_vdev, ISP3X_CNR_CTRL, id);
ctrl &= ISP32_MODULE_EN;
ctrl |= !!arg->bf3x3_wgt0_sel << 8 |
@@ -3139,63 +3217,63 @@
value &= ~ISP3X_CNR_GLOBAL_GAIN_ALPHA_MAX;
value |= BIT(15);
}
- isp3_param_write(params_vdev, ctrl, ISP3X_CNR_CTRL);
- isp3_param_write(params_vdev, value, ISP3X_CNR_EXGAIN);
+ isp3_param_write(params_vdev, ctrl, ISP3X_CNR_CTRL, id);
+ isp3_param_write(params_vdev, value, ISP3X_CNR_EXGAIN, id);
value = ISP_PACK_2SHORT(arg->thumb_sigma_c, arg->thumb_sigma_y);
- isp3_param_write(params_vdev, value, ISP32_CNR_THUMB1);
+ isp3_param_write(params_vdev, value, ISP32_CNR_THUMB1, id);
value = arg->thumb_bf_ratio & 0x7ff;
- isp3_param_write(params_vdev, value, ISP32_CNR_THUMB_BF_RATIO);
+ isp3_param_write(params_vdev, value, ISP32_CNR_THUMB_BF_RATIO, id);
value = ISP_PACK_4BYTE(arg->lbf1x7_weit_d0, arg->lbf1x7_weit_d1,
arg->lbf1x7_weit_d2, arg->lbf1x7_weit_d3);
- isp3_param_write(params_vdev, value, ISP32_CNR_LBF_WEITD);
+ isp3_param_write(params_vdev, value, ISP32_CNR_LBF_WEITD, id);
value = (arg->wgt_slope & 0x3ff) << 20 | (arg->exp_shift & 0x3f) << 12 |
arg->iir_strength << 4 | (arg->iir_uvgain & 0xf);
- isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA1);
+ isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA1, id);
value = ISP_PACK_4BYTE(arg->chroma_ghost, arg->iir_uv_clip, 0, 0);
- isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA2);
+ isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA2, id);
value = ISP_PACK_4BYTE(arg->gaus_coe[0], arg->gaus_coe[1],
arg->gaus_coe[2], arg->gaus_coe[3]);
- isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE1);
+ isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE1, id);
value = ISP_PACK_4BYTE(arg->gaus_coe[4], arg->gaus_coe[5], 0, 0);
- isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE2);
+ isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE2, id);
value = (arg->global_alpha & 0x7ff) << 20 | arg->bf_wgt_clip << 12 |
(arg->gaus_ratio & 0x7ff);
- isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_RATIO);
+ isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_RATIO, id);
value = arg->bf_ratio << 24 | (arg->sigma_r & 0x3fff) << 8 |
(arg->uv_gain & 0x7f);
- isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA1);
+ isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA1, id);
value = (arg->adj_ratio & 0x7fff) << 16 | (arg->adj_offset & 0x1ff);
- isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA2);
+ isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA2, id);
for (i = 0; i < ISP32_CNR_SIGMA_Y_NUM / 4; i++) {
value = ISP_PACK_4BYTE(arg->sigma_y[i * 4], arg->sigma_y[i * 4 + 1],
arg->sigma_y[i * 4 + 2], arg->sigma_y[i * 4 + 3]);
- isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4, id);
}
value = arg->sigma_y[i * 4];
- isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4, id);
value = (arg->iir_gain_alpha & 0xf) << 8 | arg->iir_global_gain;
- isp3_param_write(params_vdev, value, ISP32_CNR_IIR_GLOBAL_GAIN);
+ isp3_param_write(params_vdev, value, ISP32_CNR_IIR_GLOBAL_GAIN, id);
}
static void
-isp_cnr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_cnr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 cnr_ctrl;
bool real_en;
- cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL);
+ cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL, id);
real_en = !!(cnr_ctrl & ISP32_MODULE_EN);
if ((en && real_en) || (!en && !real_en))
return;
@@ -3203,21 +3281,21 @@
if (en) {
cnr_ctrl |= ISP32_MODULE_EN;
isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
- ISP3X_CNR_FST_FRAME);
+ ISP3X_CNR_FST_FRAME, id);
} else {
cnr_ctrl &= ~ISP32_MODULE_EN;
}
- isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL);
+ isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL, id);
}
static void
isp_sharp_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_sharp_cfg *arg)
+ const struct isp32_sharp_cfg *arg, u32 id)
{
u32 i, value;
- value = isp3_param_read(params_vdev, ISP3X_SHARP_EN);
+ value = isp3_param_read(params_vdev, ISP3X_SHARP_EN, id);
value &= ISP32_MODULE_EN;
value |= !!arg->bypass << 1 |
@@ -3229,11 +3307,11 @@
else
value |= !!arg->clip_hf_mode << 6 |
!!arg->add_mode << 7;
- isp3_param_write(params_vdev, value, ISP3X_SHARP_EN);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EN, id);
value = ISP_PACK_4BYTE(arg->pbf_ratio, arg->gaus_ratio,
arg->bf_ratio, arg->sharp_ratio);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_RATIO);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_RATIO, id);
value = (arg->luma_dx[6] & 0x0F) << 24 |
(arg->luma_dx[5] & 0x0F) << 20 |
@@ -3242,217 +3320,222 @@
(arg->luma_dx[2] & 0x0F) << 8 |
(arg->luma_dx[1] & 0x0F) << 4 |
(arg->luma_dx[0] & 0x0F);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_LUMA_DX);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_LUMA_DX, id);
value = (arg->pbf_sigma_inv[2] & 0x3FF) << 20 |
(arg->pbf_sigma_inv[1] & 0x3FF) << 10 |
(arg->pbf_sigma_inv[0] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_0);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_0, id);
value = (arg->pbf_sigma_inv[5] & 0x3FF) << 20 |
(arg->pbf_sigma_inv[4] & 0x3FF) << 10 |
(arg->pbf_sigma_inv[3] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_1);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_1, id);
value = (arg->pbf_sigma_inv[7] & 0x3FF) << 10 |
(arg->pbf_sigma_inv[6] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_2);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_2, id);
value = (arg->bf_sigma_inv[2] & 0x3FF) << 20 |
(arg->bf_sigma_inv[1] & 0x3FF) << 10 |
(arg->bf_sigma_inv[0] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_0);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_0, id);
value = (arg->bf_sigma_inv[5] & 0x3FF) << 20 |
(arg->bf_sigma_inv[4] & 0x3FF) << 10 |
(arg->bf_sigma_inv[3] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_1);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_1, id);
value = (arg->bf_sigma_inv[7] & 0x3FF) << 10 |
(arg->bf_sigma_inv[6] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_2);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_2, id);
value = (arg->bf_sigma_shift & 0x0F) << 4 |
(arg->pbf_sigma_shift & 0x0F);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_SIGMA_SHIFT);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_SIGMA_SHIFT, id);
value = (arg->clip_hf[2] & 0x3FF) << 20 |
(arg->clip_hf[1] & 0x3FF) << 10 |
(arg->clip_hf[0] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_0);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_0, id);
value = (arg->clip_hf[5] & 0x3FF) << 20 |
(arg->clip_hf[4] & 0x3FF) << 10 |
(arg->clip_hf[3] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_1);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_1, id);
value = (arg->clip_hf[7] & 0x3FF) << 10 |
(arg->clip_hf[6] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_2);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_2, id);
value = ISP_PACK_4BYTE(arg->pbf_coef0, arg->pbf_coef1, arg->pbf_coef2, 0);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_COEF);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_COEF, id);
value = ISP_PACK_4BYTE(arg->bf_coef0, arg->bf_coef1, arg->bf_coef2, 0);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_COEF);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_COEF, id);
value = ISP_PACK_4BYTE(arg->gaus_coef[0], arg->gaus_coef[1], arg->gaus_coef[2], 0);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF0);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF0, id);
value = ISP_PACK_4BYTE(arg->gaus_coef[3], arg->gaus_coef[4], arg->gaus_coef[5], 0);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF1);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF1, id);
value = arg->local_gainscale << 24 | (arg->global_gain_alpha & 0xf) << 16 |
(arg->global_gain & 0x3ff);
- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN);
+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN, id);
for (i = 0; i < ISP32_SHARP_GAIN_ADJ_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->gain_adj[i * 2], arg->gain_adj[i * 2 + 1]);
- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_ADJUST0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_ADJUST0 + i * 4, id);
}
value = ISP_PACK_2SHORT(arg->center_wid, arg->center_het);
- isp3_param_write(params_vdev, value, ISP32_SHARP_CENTER);
+ isp3_param_write(params_vdev, value, ISP32_SHARP_CENTER, id);
for (i = 0; i < ISP32_SHARP_STRENGTH_NUM / 4; i++) {
value = ISP_PACK_4BYTE(arg->strength[i * 4], arg->strength[i * 4 + 1],
arg->strength[i * 4 + 2], arg->strength[i * 4 + 3]);
- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4, id);
}
value = ISP_PACK_4BYTE(arg->strength[i * 4], arg->strength[i * 4 + 1], 0, 0);
- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4, id);
if (params_vdev->dev->isp_ver == ISP_V32) {
value = (arg->noise_strength & 0x3fff) << 16 | (arg->enhance_bit & 0xf) << 12 |
(arg->noise_sigma & 0x3ff);
- isp3_param_write(params_vdev, value, ISP32_SHARP_TEXTURE);
+ isp3_param_write(params_vdev, value, ISP32_SHARP_TEXTURE, id);
} else {
value = (arg->ehf_th[2] & 0x3FF) << 20 |
(arg->ehf_th[1] & 0x3FF) << 10 |
(arg->ehf_th[0] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_0);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_0, id);
value = (arg->ehf_th[5] & 0x3FF) << 20 |
(arg->ehf_th[4] & 0x3FF) << 10 |
(arg->ehf_th[3] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_1);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_1, id);
value = (arg->ehf_th[7] & 0x3FF) << 10 |
(arg->ehf_th[6] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_2);
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_2, id);
value = (arg->clip_neg[2] & 0x3FF) << 20 |
(arg->clip_neg[1] & 0x3FF) << 10 |
(arg->clip_neg[0] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_0);
+ isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_0, id);
value = (arg->clip_neg[5] & 0x3FF) << 20 |
(arg->clip_neg[4] & 0x3FF) << 10 |
(arg->clip_neg[3] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_1);
+ isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_1, id);
value = (arg->clip_neg[7] & 0x3FF) << 10 |
(arg->clip_neg[6] & 0x3FF);
- isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_2);
+ isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_2, id);
}
}
static void
-isp_sharp_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_sharp_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
- value = isp3_param_read_cache(params_vdev, ISP3X_SHARP_EN);
+ value = isp3_param_read_cache(params_vdev, ISP3X_SHARP_EN, id);
+ if ((en && (value & ISP32_MODULE_EN)) ||
+ (!en && !(value & ISP32_MODULE_EN)))
+ return;
+
value &= ~ISP32_MODULE_EN;
-
- if (en)
+ if (en) {
+ isp3_param_set_bits(params_vdev,
+ ISP3X_ISP_CTRL1, ISP32_SHP_FST_FRAME, id);
value |= ISP32_MODULE_EN;
-
- isp3_param_write(params_vdev, value, ISP3X_SHARP_EN);
+ }
+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EN, id);
}
static void
isp_baynr_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_baynr_cfg *arg)
+ const struct isp32_baynr_cfg *arg, u32 id)
{
u32 i, value;
- value = isp3_param_read(params_vdev, ISP3X_BAYNR_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_BAYNR_CTRL, id);
value &= ISP32_MODULE_EN;
value |= !!arg->bay3d_gain_en << 16 |
(arg->lg2_mode & 0x3) << 12 |
!!arg->gauss_en << 8 |
!!arg->log_bypass << 4;
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL, id);
value = ISP_PACK_2SHORT(arg->dgain0, arg->dgain1);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_DGAIN0);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_DGAIN0, id);
- isp3_param_write(params_vdev, arg->dgain2, ISP3X_BAYNR_DGAIN1);
- isp3_param_write(params_vdev, arg->pix_diff, ISP3X_BAYNR_PIXDIFF);
+ isp3_param_write(params_vdev, arg->dgain2, ISP3X_BAYNR_DGAIN1, id);
+ isp3_param_write(params_vdev, arg->pix_diff, ISP3X_BAYNR_PIXDIFF, id);
value = ISP_PACK_2SHORT(arg->softthld, arg->diff_thld);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_THLD);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_THLD, id);
value = ISP_PACK_2SHORT(arg->reg_w1, arg->bltflt_streng);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_W1_STRENG);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_W1_STRENG, id);
for (i = 0; i < ISP32_BAYNR_XY_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->sigma_x[2 * i], arg->sigma_x[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAX01 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAX01 + 4 * i, id);
}
for (i = 0; i < ISP32_BAYNR_XY_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->sigma_y[2 * i], arg->sigma_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAY01 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAY01 + 4 * i, id);
}
value = (arg->weit_d2 & 0x3FF) << 20 |
(arg->weit_d1 & 0x3FF) << 10 |
(arg->weit_d0 & 0x3FF);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_WRIT_D);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_WRIT_D, id);
value = ISP_PACK_2SHORT(arg->lg2_off, arg->lg2_lgoff);
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_LG_OFF);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_LG_OFF, id);
value = arg->dat_max & 0xfffff;
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_DAT_MAX);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_DAT_MAX, id);
value = ISP_PACK_2SHORT(arg->rgain_off, arg->bgain_off);
- isp3_param_write(params_vdev, value, ISP32_BAYNR_SIGOFF);
+ isp3_param_write(params_vdev, value, ISP32_BAYNR_SIGOFF, id);
for (i = 0; i < ISP32_BAYNR_GAIN_NUM / 4; i++) {
value = ISP_PACK_4BYTE(arg->gain_x[i * 4], arg->gain_x[i * 4 + 1],
arg->gain_x[i * 4 + 2], arg->gain_x[i * 4 + 3]);
- isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINX03 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINX03 + i * 4, id);
}
for (i = 0; i < ISP32_BAYNR_GAIN_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->gain_y[i * 2], arg->gain_y[i * 2 + 1]);
- isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINY01 + i * 4);
+ isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINY01 + i * 4, id);
}
}
static void
-isp_baynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_baynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
u32 value;
- value = isp3_param_read_cache(params_vdev, ISP3X_BAYNR_CTRL);
+ value = isp3_param_read_cache(params_vdev, ISP3X_BAYNR_CTRL, id);
value &= ~ISP32_MODULE_EN;
if (en)
value |= ISP32_MODULE_EN;
- isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL, id);
}
static void
isp_bay3d_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_bay3d_cfg *arg)
+ const struct isp32_bay3d_cfg *arg, u32 id)
{
struct rkisp_isp_params_val_v32 *priv_val;
u32 i, value;
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
- value = isp3_param_read(params_vdev, ISP3X_BAY3D_CTRL);
+ value = isp3_param_read(params_vdev, ISP3X_BAY3D_CTRL, id);
value &= (ISP32_MODULE_EN | ISP32_BAY3D_BWSAVING(1));
value |= !!arg->loswitch_protect << 12 |
@@ -3478,7 +3561,7 @@
"bwsaving to %d no support change for bay3d en\n",
arg->bwsaving_en);
}
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_CTRL);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_CTRL, id);
value = !!arg->wgtmix_opt_en << 12 |
!!arg->curds_high_en << 8 |
@@ -3500,72 +3583,72 @@
value &= ~(BIT(3) | BIT(4));
else if (!(value & (BIT(3) | BIT(4))))
value |= BIT(3);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1, id);
value = ISP_PACK_2SHORT(arg->softwgt, arg->hidif_th);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_KALRATIO);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_KALRATIO, id);
- isp3_param_write(params_vdev, arg->glbpk2, ISP3X_BAY3D_GLBPK2);
+ isp3_param_write(params_vdev, arg->glbpk2, ISP3X_BAY3D_GLBPK2, id);
value = ISP_PACK_2SHORT(arg->wgtlmt, arg->wgtratio);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_WGTLMT);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_WGTLMT, id);
for (i = 0; i < ISP32_BAY3D_XY_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->sig0_x[2 * i],
arg->sig0_x[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_X0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_X0 + 4 * i, id);
value = ISP_PACK_2SHORT(arg->sig1_x[2 * i],
arg->sig1_x[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_X0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_X0 + 4 * i, id);
}
for (i = 0; i < ISP32_BAY3D_XY_NUM / 2; i++) {
value = ISP_PACK_2SHORT(arg->sig0_y[2 * i],
arg->sig0_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_Y0 + 4 * i, id);
value = ISP_PACK_2SHORT(arg->sig1_y[2 * i],
arg->sig1_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_Y0 + 4 * i, id);
value = ISP_PACK_2SHORT(arg->sig2_y[2 * i],
arg->sig2_y[2 * i + 1]);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG2_Y0 + 4 * i);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG2_Y0 + 4 * i, id);
}
if (params_vdev->dev->isp_ver == ISP_V32_L) {
value = ISP_PACK_2SHORT(0, arg->wgtmin);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_LODIF_STAT1);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_LODIF_STAT1, id);
}
value = ISP_PACK_2SHORT(arg->hisigrat0, arg->hisigrat1);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGRAT);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGRAT, id);
value = ISP_PACK_2SHORT(arg->hisigoff0, arg->hisigoff1);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGOFF);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGOFF, id);
value = ISP_PACK_2SHORT(arg->losigoff, arg->losigrat);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_LOSIG);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_LOSIG, id);
value = ISP_PACK_2SHORT(arg->rgain_off, arg->bgain_off);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGPK);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGPK, id);
value = ISP_PACK_4BYTE(arg->siggaus0, arg->siggaus1, arg->siggaus2, 0);
if (params_vdev->dev->isp_ver == ISP_V32)
value |= (arg->siggaus3 << 24);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGGAUS);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGGAUS, id);
}
static void
-isp_bay3d_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_bay3d_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
struct rkisp_device *ispdev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
u32 value, bay3d_ctrl;
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
- bay3d_ctrl = isp3_param_read_cache(params_vdev, ISP3X_BAY3D_CTRL);
+ bay3d_ctrl = isp3_param_read_cache(params_vdev, ISP3X_BAY3D_CTRL, id);
if ((en && (bay3d_ctrl & ISP32_MODULE_EN)) ||
(!en && !(bay3d_ctrl & ISP32_MODULE_EN)))
return;
@@ -3576,85 +3659,85 @@
return;
}
- value = priv_val->buf_3dnr_iir.size;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_SIZE);
- value = priv_val->buf_3dnr_iir.dma_addr;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_BASE);
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_RD_BASE);
+ value = priv_val->bay3d_iir_size;
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_SIZE, id);
+ value = priv_val->buf_3dnr_iir.dma_addr + value * id;
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_BASE, id);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_RD_BASE, id);
- value = priv_val->buf_3dnr_ds.size;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_SIZE);
- value = priv_val->buf_3dnr_ds.dma_addr;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_BASE);
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_RD_BASE);
+ value = priv_val->bay3d_ds_size;
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_SIZE, id);
+ value = priv_val->buf_3dnr_ds.dma_addr + value * id;
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_BASE, id);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_RD_BASE, id);
value = priv_val->is_sram ?
ispdev->hw_dev->sram.dma_addr : priv_val->buf_3dnr_cur.dma_addr;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_BASE);
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_BASE);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_BASE, id);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_BASE, id);
value = priv_val->bay3d_cur_size;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_SIZE);
- isp3_param_write(params_vdev, value, ISP32_MI_BAY3D_CUR_RD_SIZE);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_SIZE, id);
+ isp3_param_write(params_vdev, value, ISP32_MI_BAY3D_CUR_RD_SIZE, id);
value = priv_val->bay3d_cur_wsize;
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_LENGTH);
- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_LENGTH);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_LENGTH, id);
+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_LENGTH, id);
value = priv_val->bay3d_cur_wrap_line << 16 |
(ispdev->isp_ver == ISP_V32 ? 28 : 20);
- isp3_param_write(params_vdev, value, ISP3X_BAY3D_MI_ST);
+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_MI_ST, id);
/* mibuf_size for fifo_cur_full, set to max: (3072 - 2) / 2, 2 align */
if (ispdev->isp_ver == ISP_V32) {
value = 0x5fe << 16;
- isp3_param_set_bits(params_vdev, ISP3X_BAY3D_IN_IRQ_LINECNT, value);
+ isp3_param_set_bits(params_vdev, ISP3X_BAY3D_IN_IRQ_LINECNT, value, id);
}
- value = isp3_param_read_cache(params_vdev, ISP32_BAY3D_CTRL1);
+ value = isp3_param_read_cache(params_vdev, ISP32_BAY3D_CTRL1, id);
if (priv_val->is_lo8x8) {
if (value & (BIT(3) | BIT(4))) {
value &= ~(BIT(3) | BIT(4));
- isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1, id);
}
} else if (!(value & (BIT(3) | BIT(4)))) {
value |= BIT(3);
- isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1);
+ isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1, id);
}
bay3d_ctrl |= ISP32_MODULE_EN;
- isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL);
+ isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL, id);
value = ISP3X_BAY3D_IIR_WR_AUTO_UPD | ISP3X_BAY3D_CUR_WR_AUTO_UPD |
ISP3X_BAY3D_DS_WR_AUTO_UPD | ISP3X_BAY3D_IIRSELF_UPD |
ISP3X_BAY3D_CURSELF_UPD | ISP3X_BAY3D_DSSELF_UPD |
ISP3X_BAY3D_RDSELF_UPD;
- isp3_param_set_bits(params_vdev, MI_WR_CTRL2, value);
+ isp3_param_set_bits(params_vdev, MI_WR_CTRL2, value, id);
- isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1, ISP3X_RAW3D_FST_FRAME);
+ isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1, ISP3X_RAW3D_FST_FRAME, id);
} else {
bay3d_ctrl &= ~ISP32_MODULE_EN;
- isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL);
- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(4));
+ isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL, id);
+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(4), id);
}
}
static void
isp_gain_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp3x_gain_cfg *arg)
+ const struct isp3x_gain_cfg *arg, u32 id)
{
u32 val;
val = arg->g0 & 0x3ffff;
- isp3_param_write(params_vdev, val, ISP3X_GAIN_G0);
+ isp3_param_write(params_vdev, val, ISP3X_GAIN_G0, id);
val = ISP_PACK_2SHORT(arg->g1, arg->g2);
- isp3_param_write(params_vdev, val, ISP3X_GAIN_G1_G2);
+ isp3_param_write(params_vdev, val, ISP3X_GAIN_G1_G2, id);
}
static void
-isp_gain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_gain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
struct rkisp_isp_params_val_v32 *priv_val =
(struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
u32 val = 0;
- val = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL);
+ val = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL, id);
if (en) {
if (params_vdev->dev->isp_ver == ISP_V32) {
val |= priv_val->lut3d_en << 20 |
@@ -3662,7 +3745,7 @@
priv_val->drc_en << 12 |
priv_val->lsc_en << 8 |
priv_val->bay3d_en << 4;
- if (isp3_param_read(params_vdev, ISP3X_HDRMGE_CTRL) & BIT(0))
+ if (isp3_param_read(params_vdev, ISP3X_HDRMGE_CTRL, id) & BIT(0))
val |= BIT(1);
if (val)
val |= ISP32_MODULE_EN;
@@ -3670,12 +3753,12 @@
val |= ISP32_MODULE_EN;
}
}
- isp3_param_write(params_vdev, val, ISP3X_GAIN_CTRL);
+ isp3_param_write(params_vdev, val, ISP3X_GAIN_CTRL, id);
}
static void
isp_cac_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_cac_cfg *arg)
+ const struct isp32_cac_cfg *arg, u32 id)
{
struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
@@ -3684,7 +3767,7 @@
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
- ctrl = isp3_param_read(params_vdev, ISP3X_CAC_CTRL);
+ ctrl = isp3_param_read(params_vdev, ISP3X_CAC_CTRL, id);
ctrl &= ISP3X_CAC_EN;
ctrl |= !!arg->bypass_en << 1 | !!arg->center_en << 3 |
(arg->clip_g_mode & 0x3) << 5 | !!arg->edge_detect_en << 7 |
@@ -3692,38 +3775,38 @@
val = (arg->psf_sft_bit & 0xff) |
(arg->cfg_num & 0x7ff) << 8;
- isp3_param_write(params_vdev, val, ISP3X_CAC_PSF_PARA);
+ isp3_param_write(params_vdev, val, ISP3X_CAC_PSF_PARA, id);
val = ISP_PACK_2SHORT(arg->center_width, arg->center_height);
- isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH_CENTER);
+ isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH_CENTER, id);
for (i = 0; i < ISP32_CAC_STRENGTH_NUM / 2; i++) {
val = ISP_PACK_2SHORT(arg->strength[2 * i], arg->strength[2 * i + 1]);
- isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH0 + i * 4);
+ isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH0 + i * 4, id);
}
val = (arg->flat_thed_r & 0x1f) << 8 | (arg->flat_thed_b & 0x1f);
- isp3_param_write(params_vdev, val, ISP32_CAC_FLAT_THED);
+ isp3_param_write(params_vdev, val, ISP32_CAC_FLAT_THED, id);
val = ISP_PACK_2SHORT(arg->offset_b, arg->offset_r);
- isp3_param_write(params_vdev, val, ISP32_CAC_OFFSET);
+ isp3_param_write(params_vdev, val, ISP32_CAC_OFFSET, id);
val = arg->expo_thed_b & 0x1fffff;
- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_B);
+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_B, id);
val = arg->expo_thed_r & 0x1fffff;
- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_R);
+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_R, id);
val = arg->expo_adj_b & 0xfffff;
- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_B);
+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_B, id);
val = arg->expo_adj_r & 0xfffff;
- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_R);
+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_R, id);
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
- if (!priv_val->buf_cac[i].mem_priv)
+ if (!priv_val->buf_cac[id][i].mem_priv)
continue;
- if (arg->buf_fd == priv_val->buf_cac[i].dma_fd)
+ if (arg->buf_fd == priv_val->buf_cac[id][i].dma_fd)
break;
}
@@ -3732,44 +3815,53 @@
return;
}
- if (!priv_val->buf_cac[i].vaddr) {
+ if (!priv_val->buf_cac[id][i].vaddr) {
dev_err(dev->dev, "no cac buffer allocated\n");
return;
}
- val = priv_val->buf_cac_idx;
- head = (struct isp2x_mesh_head *)priv_val->buf_cac[val].vaddr;
+ val = priv_val->buf_cac_idx[id];
+ head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][val].vaddr;
head->stat = MESH_BUF_INIT;
- head = (struct isp2x_mesh_head *)priv_val->buf_cac[i].vaddr;
+ head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][i].vaddr;
head->stat = MESH_BUF_CHIPINUSE;
- priv_val->buf_cac_idx = i;
- rkisp_prepare_buffer(dev, &priv_val->buf_cac[i]);
- val = priv_val->buf_cac[i].dma_addr + head->data_oft;
- isp3_param_write(params_vdev, val, ISP3X_MI_LUT_CAC_RD_BASE);
- isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_CAC_RD_H_WSIZE);
- isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_CAC_RD_V_SIZE);
+ priv_val->buf_cac_idx[id] = i;
+ rkisp_prepare_buffer(dev, &priv_val->buf_cac[id][i]);
+ val = priv_val->buf_cac[id][i].dma_addr + head->data_oft;
+ isp3_param_write(params_vdev, val, ISP3X_MI_LUT_CAC_RD_BASE, id);
+ isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_CAC_RD_H_WSIZE, id);
+ isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_CAC_RD_V_SIZE, id);
if (ctrl & ISP3X_CAC_EN)
ctrl |= ISP3X_CAC_LUT_EN | ISP32_SELF_FORCE_UPD | ISP3X_CAC_LUT_MODE(3);
- isp3_param_write(params_vdev, ctrl, ISP3X_CAC_CTRL);
+ isp3_param_write(params_vdev, ctrl, ISP3X_CAC_CTRL, id);
}
static void
-isp_cac_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
+isp_cac_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
{
+ struct rkisp_device *dev = params_vdev->dev;
+ struct rkisp_isp_params_val_v32 *priv_val;
u32 val;
- val = isp3_param_read(params_vdev, ISP3X_CAC_CTRL);
+ priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
+ val = priv_val->buf_cac_idx[id];
+ if (en && !priv_val->buf_cac[id][val].vaddr) {
+ dev_err(dev->dev, "no cac buffer allocated\n");
+ return;
+ }
+
+ val = isp3_param_read(params_vdev, ISP3X_CAC_CTRL, id);
val &= ~(ISP3X_CAC_EN | ISP3X_CAC_LUT_EN | ISP32_SELF_FORCE_UPD);
if (en)
val |= ISP3X_CAC_EN | ISP3X_CAC_LUT_EN |
ISP32_SELF_FORCE_UPD | ISP3X_CAC_LUT_MODE(3);
- isp3_param_write(params_vdev, val, ISP3X_CAC_CTRL);
+ isp3_param_write(params_vdev, val, ISP3X_CAC_CTRL, id);
}
static void
isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp21_csm_cfg *arg)
+ const struct isp21_csm_cfg *arg, u32 id)
{
u32 i, val;
@@ -3780,19 +3872,19 @@
(arg->csm_coeff[i] & 0x1ff);
else
val = arg->csm_coeff[i] & 0x1ff;
- isp3_param_write(params_vdev, val, ISP3X_ISP_CC_COEFF_0 + i * 4);
+ isp3_param_write(params_vdev, val, ISP3X_ISP_CC_COEFF_0 + i * 4, id);
}
- val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
+ val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
val |= CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
- isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0);
+ isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0, id);
}
static void
isp_cgc_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp21_cgc_cfg *arg)
+ const struct isp21_cgc_cfg *arg, u32 id)
{
- u32 val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
+ u32 val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
u32 eff_ctrl, cproc_ctrl;
params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
@@ -3803,31 +3895,31 @@
}
if (arg->ratio_en)
val |= ISP3X_SW_CGC_RATIO_EN;
- isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0);
+ isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0, id);
- cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL);
+ cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL, id);
if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
val = CIF_C_PROC_YOUT_FULL | CIF_C_PROC_YIN_FULL | CIF_C_PROC_COUT_FULL;
if (arg->yuv_limit)
cproc_ctrl &= ~val;
else
cproc_ctrl |= val;
- isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL);
+ isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL, id);
}
- eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL);
+ eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL, id);
if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
if (arg->yuv_limit)
eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
else
eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
- isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL);
+ isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL, id);
}
}
static void
isp_vsm_config(struct rkisp_isp_params_vdev *params_vdev,
- const struct isp32_vsm_cfg *arg)
+ const struct isp32_vsm_cfg *arg, u32 id)
{
struct rkisp_device *ispdev = params_vdev->dev;
struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
@@ -3836,38 +3928,38 @@
u32 val, h, v;
val = arg->h_offs;
- isp3_param_write(params_vdev, val, ISP32_VSM_H_OFFS);
+ isp3_param_write(params_vdev, val, ISP32_VSM_H_OFFS, id);
val = arg->v_offs;
- isp3_param_write(params_vdev, val, ISP32_VSM_V_OFFS);
+ isp3_param_write(params_vdev, val, ISP32_VSM_V_OFFS, id);
h = arg->h_size;
if (h > width - arg->h_offs)
h = width - arg->h_offs;
h &= ~1;
- isp3_param_write(params_vdev, h, ISP32_VSM_H_SIZE);
+ isp3_param_write(params_vdev, h, ISP32_VSM_H_SIZE, id);
v = arg->v_size;
if (v > height - arg->v_offs)
v = height - arg->v_offs;
v &= ~1;
- isp3_param_write(params_vdev, v, ISP32_VSM_V_SIZE);
+ isp3_param_write(params_vdev, v, ISP32_VSM_V_SIZE, id);
val = arg->h_segments;
if (val > (h - 48) / 16)
val = (h - 48) / 16;
- isp3_param_write(params_vdev, val, ISP32_VSM_H_SEGMENTS);
+ isp3_param_write(params_vdev, val, ISP32_VSM_H_SEGMENTS, id);
val = arg->v_segments;
if (val > (v - 48) / 16)
val = (v - 48) / 16;
- isp3_param_write(params_vdev, val, ISP32_VSM_V_SEGMENTS);
+ isp3_param_write(params_vdev, val, ISP32_VSM_V_SEGMENTS, id);
}
static void
isp_vsm_enable(struct rkisp_isp_params_vdev *params_vdev,
- bool en)
+ bool en, u32 id)
{
- isp3_param_write(params_vdev, en, ISP32_VSM_MODE);
+ isp3_param_write(params_vdev, en, ISP32_VSM_MODE, id);
}
struct rkisp_isp_params_ops_v32 isp_params_ops_v32 = {
@@ -3946,7 +4038,7 @@
static __maybe_unused
void __isp_isr_other_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp32_isp_params_cfg *new_params,
- enum rkisp_params_type type)
+ enum rkisp_params_type type, u32 id)
{
struct rkisp_isp_params_ops_v32 *ops =
(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
@@ -3958,101 +4050,101 @@
if (type == RKISP_PARAMS_SHD) {
if ((module_cfg_update & ISP32_MODULE_HDRMGE))
- ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type);
+ ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type, id);
if ((module_cfg_update & ISP32_MODULE_DRC))
- ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type);
+ ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type, id);
return;
}
v4l2_dbg(4, rkisp_debug, ¶ms_vdev->dev->v4l2_dev,
- "%s seq:%d module_cfg_update:0x%llx\n",
- __func__, new_params->frame_id, module_cfg_update);
+ "%s id:%d seq:%d module_cfg_update:0x%llx\n",
+ __func__, id, new_params->frame_id, module_cfg_update);
if (module_cfg_update & ISP32_MODULE_LSC)
- ops->lsc_config(params_vdev, &new_params->others.lsc_cfg);
+ ops->lsc_config(params_vdev, &new_params->others.lsc_cfg, id);
if (module_cfg_update & ISP32_MODULE_DPCC)
- ops->dpcc_config(params_vdev, &new_params->others.dpcc_cfg);
+ ops->dpcc_config(params_vdev, &new_params->others.dpcc_cfg, id);
if (module_cfg_update & ISP32_MODULE_BLS)
- ops->bls_config(params_vdev, &new_params->others.bls_cfg);
+ ops->bls_config(params_vdev, &new_params->others.bls_cfg, id);
if (module_cfg_update & ISP32_MODULE_SDG)
- ops->sdg_config(params_vdev, &new_params->others.sdg_cfg);
+ ops->sdg_config(params_vdev, &new_params->others.sdg_cfg, id);
if (module_cfg_update & ISP32_MODULE_AWB_GAIN)
- ops->awbgain_config(params_vdev, &new_params->others.awb_gain_cfg);
+ ops->awbgain_config(params_vdev, &new_params->others.awb_gain_cfg, id);
if (module_cfg_update & ISP32_MODULE_DEBAYER)
- ops->debayer_config(params_vdev, &new_params->others.debayer_cfg);
+ ops->debayer_config(params_vdev, &new_params->others.debayer_cfg, id);
if (module_cfg_update & ISP32_MODULE_CCM)
- ops->ccm_config(params_vdev, &new_params->others.ccm_cfg);
+ ops->ccm_config(params_vdev, &new_params->others.ccm_cfg, id);
if (module_cfg_update & ISP32_MODULE_GOC)
- ops->goc_config(params_vdev, &new_params->others.gammaout_cfg);
+ ops->goc_config(params_vdev, &new_params->others.gammaout_cfg, id);
/* range csm->cgc->cproc->ie */
if (module_cfg_update & ISP3X_MODULE_CSM)
- ops->csm_config(params_vdev, &new_params->others.csm_cfg);
+ ops->csm_config(params_vdev, &new_params->others.csm_cfg, id);
if (module_cfg_update & ISP3X_MODULE_CGC)
- ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
+ ops->cgc_config(params_vdev, &new_params->others.cgc_cfg, id);
if (module_cfg_update & ISP32_MODULE_CPROC)
- ops->cproc_config(params_vdev, &new_params->others.cproc_cfg);
+ ops->cproc_config(params_vdev, &new_params->others.cproc_cfg, id);
if (module_cfg_update & ISP32_MODULE_IE)
- ops->ie_config(params_vdev, &new_params->others.ie_cfg);
+ ops->ie_config(params_vdev, &new_params->others.ie_cfg, id);
if (module_cfg_update & ISP32_MODULE_HDRMGE)
- ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type);
+ ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type, id);
if (module_cfg_update & ISP32_MODULE_DRC)
- ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type);
+ ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type, id);
if (module_cfg_update & ISP32_MODULE_GIC)
- ops->gic_config(params_vdev, &new_params->others.gic_cfg);
+ ops->gic_config(params_vdev, &new_params->others.gic_cfg, id);
if (module_cfg_update & ISP32_MODULE_DHAZ)
- ops->dhaz_config(params_vdev, &new_params->others.dhaz_cfg);
+ ops->dhaz_config(params_vdev, &new_params->others.dhaz_cfg, id);
if (module_cfg_update & ISP32_MODULE_3DLUT)
- ops->isp3dlut_config(params_vdev, &new_params->others.isp3dlut_cfg);
+ ops->isp3dlut_config(params_vdev, &new_params->others.isp3dlut_cfg, id);
if (module_cfg_update & ISP32_MODULE_LDCH)
- ops->ldch_config(params_vdev, &new_params->others.ldch_cfg);
+ ops->ldch_config(params_vdev, &new_params->others.ldch_cfg, id);
if (module_cfg_update & ISP32_MODULE_YNR)
- ops->ynr_config(params_vdev, &new_params->others.ynr_cfg);
+ ops->ynr_config(params_vdev, &new_params->others.ynr_cfg, id);
if (module_cfg_update & ISP32_MODULE_CNR)
- ops->cnr_config(params_vdev, &new_params->others.cnr_cfg);
+ ops->cnr_config(params_vdev, &new_params->others.cnr_cfg, id);
if (module_cfg_update & ISP32_MODULE_SHARP)
- ops->sharp_config(params_vdev, &new_params->others.sharp_cfg);
+ ops->sharp_config(params_vdev, &new_params->others.sharp_cfg, id);
if (module_cfg_update & ISP32_MODULE_BAYNR)
- ops->baynr_config(params_vdev, &new_params->others.baynr_cfg);
+ ops->baynr_config(params_vdev, &new_params->others.baynr_cfg, id);
if (module_cfg_update & ISP32_MODULE_BAY3D)
- ops->bay3d_config(params_vdev, &new_params->others.bay3d_cfg);
+ ops->bay3d_config(params_vdev, &new_params->others.bay3d_cfg, id);
if (module_cfg_update & ISP32_MODULE_CAC)
- ops->cac_config(params_vdev, &new_params->others.cac_cfg);
+ ops->cac_config(params_vdev, &new_params->others.cac_cfg, id);
if (module_cfg_update & ISP32_MODULE_GAIN)
- ops->gain_config(params_vdev, &new_params->others.gain_cfg);
+ ops->gain_config(params_vdev, &new_params->others.gain_cfg, id);
if (module_cfg_update & ISP32_MODULE_VSM)
- ops->vsm_config(params_vdev, &new_params->others.vsm_cfg);
+ ops->vsm_config(params_vdev, &new_params->others.vsm_cfg, id);
}
static __maybe_unused
void __isp_isr_other_en(struct rkisp_isp_params_vdev *params_vdev,
const struct isp32_isp_params_cfg *new_params,
- enum rkisp_params_type type)
+ enum rkisp_params_type type, u32 id)
{
struct rkisp_isp_params_ops_v32 *ops =
(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
@@ -4070,110 +4162,110 @@
return;
v4l2_dbg(4, rkisp_debug, ¶ms_vdev->dev->v4l2_dev,
- "%s seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
- __func__, new_params->frame_id, module_en_update, module_ens);
+ "%s id:%d seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
+ __func__, id, new_params->frame_id, module_en_update, module_ens);
if (module_en_update & ISP32_MODULE_DPCC)
- ops->dpcc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DPCC));
+ ops->dpcc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DPCC), id);
if (module_en_update & ISP32_MODULE_BLS)
- ops->bls_enable(params_vdev, !!(module_ens & ISP32_MODULE_BLS));
+ ops->bls_enable(params_vdev, !!(module_ens & ISP32_MODULE_BLS), id);
if (module_en_update & ISP32_MODULE_SDG)
- ops->sdg_enable(params_vdev, !!(module_ens & ISP32_MODULE_SDG));
+ ops->sdg_enable(params_vdev, !!(module_ens & ISP32_MODULE_SDG), id);
if (module_en_update & ISP32_MODULE_LSC) {
- ops->lsc_enable(params_vdev, !!(module_ens & ISP32_MODULE_LSC));
+ ops->lsc_enable(params_vdev, !!(module_ens & ISP32_MODULE_LSC), id);
priv_val->lsc_en = !!(module_ens & ISP32_MODULE_LSC);
}
if (module_en_update & ISP32_MODULE_AWB_GAIN)
- ops->awbgain_enable(params_vdev, !!(module_ens & ISP32_MODULE_AWB_GAIN));
+ ops->awbgain_enable(params_vdev, !!(module_ens & ISP32_MODULE_AWB_GAIN), id);
if (module_en_update & ISP32_MODULE_DEBAYER)
- ops->debayer_enable(params_vdev, !!(module_ens & ISP32_MODULE_DEBAYER));
+ ops->debayer_enable(params_vdev, !!(module_ens & ISP32_MODULE_DEBAYER), id);
if (module_en_update & ISP32_MODULE_CCM)
- ops->ccm_enable(params_vdev, !!(module_ens & ISP32_MODULE_CCM));
+ ops->ccm_enable(params_vdev, !!(module_ens & ISP32_MODULE_CCM), id);
if (module_en_update & ISP32_MODULE_GOC)
- ops->goc_enable(params_vdev, !!(module_ens & ISP32_MODULE_GOC));
+ ops->goc_enable(params_vdev, !!(module_ens & ISP32_MODULE_GOC), id);
if (module_en_update & ISP32_MODULE_CPROC)
- ops->cproc_enable(params_vdev, !!(module_ens & ISP32_MODULE_CPROC));
+ ops->cproc_enable(params_vdev, !!(module_ens & ISP32_MODULE_CPROC), id);
if (module_en_update & ISP32_MODULE_IE)
- ops->ie_enable(params_vdev, !!(module_ens & ISP32_MODULE_IE));
+ ops->ie_enable(params_vdev, !!(module_ens & ISP32_MODULE_IE), id);
if (module_en_update & ISP32_MODULE_HDRMGE) {
- ops->hdrmge_enable(params_vdev, !!(module_ens & ISP32_MODULE_HDRMGE));
+ ops->hdrmge_enable(params_vdev, !!(module_ens & ISP32_MODULE_HDRMGE), id);
priv_val->mge_en = !!(module_ens & ISP32_MODULE_HDRMGE);
}
if (module_en_update & ISP32_MODULE_DRC) {
- ops->hdrdrc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DRC));
+ ops->hdrdrc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DRC), id);
priv_val->drc_en = !!(module_ens & ISP32_MODULE_DRC);
}
if (module_en_update & ISP32_MODULE_GIC)
- ops->gic_enable(params_vdev, !!(module_ens & ISP32_MODULE_GIC));
+ ops->gic_enable(params_vdev, !!(module_ens & ISP32_MODULE_GIC), id);
if (module_en_update & ISP32_MODULE_DHAZ) {
- ops->dhaz_enable(params_vdev, !!(module_ens & ISP32_MODULE_DHAZ));
+ ops->dhaz_enable(params_vdev, !!(module_ens & ISP32_MODULE_DHAZ), id);
priv_val->dhaz_en = !!(module_ens & ISP32_MODULE_DHAZ);
}
if (module_en_update & ISP32_MODULE_3DLUT) {
- ops->isp3dlut_enable(params_vdev, !!(module_ens & ISP32_MODULE_3DLUT));
+ ops->isp3dlut_enable(params_vdev, !!(module_ens & ISP32_MODULE_3DLUT), id);
priv_val->lut3d_en = !!(module_ens & ISP32_MODULE_3DLUT);
}
if (module_en_update & ISP32_MODULE_LDCH)
- ops->ldch_enable(params_vdev, !!(module_ens & ISP32_MODULE_LDCH));
+ ops->ldch_enable(params_vdev, !!(module_ens & ISP32_MODULE_LDCH), id);
if (module_en_update & ISP32_MODULE_YNR)
- ops->ynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_YNR));
+ ops->ynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_YNR), id);
if (module_en_update & ISP32_MODULE_CNR)
- ops->cnr_enable(params_vdev, !!(module_ens & ISP32_MODULE_CNR));
+ ops->cnr_enable(params_vdev, !!(module_ens & ISP32_MODULE_CNR), id);
if (module_en_update & ISP32_MODULE_SHARP)
- ops->sharp_enable(params_vdev, !!(module_ens & ISP32_MODULE_SHARP));
+ ops->sharp_enable(params_vdev, !!(module_ens & ISP32_MODULE_SHARP), id);
if (module_en_update & ISP32_MODULE_BAYNR)
- ops->baynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAYNR));
+ ops->baynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAYNR), id);
if (module_en_update & ISP32_MODULE_BAY3D) {
- ops->bay3d_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAY3D));
+ ops->bay3d_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAY3D), id);
priv_val->bay3d_en = !!(module_ens & ISP32_MODULE_BAY3D);
}
if (module_en_update & ISP32_MODULE_CAC)
- ops->cac_enable(params_vdev, !!(module_ens & ISP32_MODULE_CAC));
+ ops->cac_enable(params_vdev, !!(module_ens & ISP32_MODULE_CAC), id);
if (module_en_update & ISP32_MODULE_GAIN ||
((priv_val->buf_info_owner == RKISP_INFO2DRR_OWNER_GAIN) &&
- !(isp3_param_read(params_vdev, ISP3X_GAIN_CTRL) & ISP3X_GAIN_2DDR_EN)))
- ops->gain_enable(params_vdev, !!(module_ens & ISP32_MODULE_GAIN));
+ !(isp3_param_read(params_vdev, ISP3X_GAIN_CTRL, id) & ISP3X_GAIN_2DDR_EN)))
+ ops->gain_enable(params_vdev, !!(module_ens & ISP32_MODULE_GAIN), id);
if (module_en_update & ISP32_MODULE_VSM)
- ops->vsm_enable(params_vdev, !!(module_ens & ISP32_MODULE_VSM));
+ ops->vsm_enable(params_vdev, !!(module_ens & ISP32_MODULE_VSM), id);
/* gain disable, using global gain for cnr */
- gain_ctrl = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL);
- cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL);
+ gain_ctrl = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL, id);
+ cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL, id);
if (!(gain_ctrl & ISP32_MODULE_EN) && cnr_ctrl & ISP32_MODULE_EN) {
cnr_ctrl |= BIT(1);
- isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL);
- val = isp3_param_read(params_vdev, ISP3X_CNR_EXGAIN) & 0x3ff;
- isp3_param_write(params_vdev, val | 0x8000, ISP3X_CNR_EXGAIN);
+ isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL, id);
+ val = isp3_param_read(params_vdev, ISP3X_CNR_EXGAIN, id) & 0x3ff;
+ isp3_param_write(params_vdev, val | 0x8000, ISP3X_CNR_EXGAIN, id);
}
}
static __maybe_unused
void __isp_isr_meas_config(struct rkisp_isp_params_vdev *params_vdev,
struct isp32_isp_params_cfg *new_params,
- enum rkisp_params_type type)
+ enum rkisp_params_type type, u32 id)
{
struct rkisp_isp_params_ops_v32 *ops =
(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
@@ -4190,48 +4282,48 @@
return;
v4l2_dbg(4, rkisp_debug, ¶ms_vdev->dev->v4l2_dev,
- "%s seq:%d module_cfg_update:0x%llx\n",
- __func__, new_params->frame_id, module_cfg_update);
+ "%s id:%d seq:%d module_cfg_update:0x%llx\n",
+ __func__, id, new_params->frame_id, module_cfg_update);
if ((module_cfg_update & ISP32_MODULE_RAWAF))
- ops->rawaf_config(params_vdev, &new_params->meas.rawaf);
+ ops->rawaf_config(params_vdev, &new_params->meas.rawaf, id);
if ((module_cfg_update & ISP32_MODULE_RAWAE0) &&
!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32_L))
- ops->rawae0_config(params_vdev, &new_params->meas.rawae0);
+ ops->rawae0_config(params_vdev, &new_params->meas.rawae0, id);
if ((module_cfg_update & ISP32_MODULE_RAWAE1))
- ops->rawae1_config(params_vdev, &new_params->meas.rawae1);
+ ops->rawae1_config(params_vdev, &new_params->meas.rawae1, id);
if ((module_cfg_update & ISP32_MODULE_RAWAE2))
- ops->rawae2_config(params_vdev, &new_params->meas.rawae2);
+ ops->rawae2_config(params_vdev, &new_params->meas.rawae2, id);
if ((module_cfg_update & ISP32_MODULE_RAWAE3) &&
!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32))
- ops->rawae3_config(params_vdev, &new_params->meas.rawae3);
+ ops->rawae3_config(params_vdev, &new_params->meas.rawae3, id);
if ((module_cfg_update & ISP32_MODULE_RAWHIST0))
- ops->rawhst0_config(params_vdev, &new_params->meas.rawhist0);
+ ops->rawhst0_config(params_vdev, &new_params->meas.rawhist0, id);
if ((module_cfg_update & ISP32_MODULE_RAWHIST1))
- ops->rawhst1_config(params_vdev, &new_params->meas.rawhist1);
+ ops->rawhst1_config(params_vdev, &new_params->meas.rawhist1, id);
if ((module_cfg_update & ISP32_MODULE_RAWHIST2))
- ops->rawhst2_config(params_vdev, &new_params->meas.rawhist2);
+ ops->rawhst2_config(params_vdev, &new_params->meas.rawhist2, id);
if ((module_cfg_update & ISP32_MODULE_RAWHIST3))
- ops->rawhst3_config(params_vdev, &new_params->meas.rawhist3);
+ ops->rawhst3_config(params_vdev, &new_params->meas.rawhist3, id);
if ((module_cfg_update & ISP32_MODULE_RAWAWB) ||
((priv_val->buf_info_owner == RKISP_INFO2DRR_OWNER_AWB) &&
- !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL) & ISP32_RAWAWB_2DDR_PATH_EN)))
- ops->rawawb_config(params_vdev, &new_params->meas.rawawb);
+ !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL, id) & ISP32_RAWAWB_2DDR_PATH_EN)))
+ ops->rawawb_config(params_vdev, &new_params->meas.rawawb, id);
}
static __maybe_unused
void __isp_isr_meas_en(struct rkisp_isp_params_vdev *params_vdev,
struct isp32_isp_params_cfg *new_params,
- enum rkisp_params_type type)
+ enum rkisp_params_type type, u32 id)
{
struct rkisp_isp_params_ops_v32 *ops =
(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
@@ -4245,64 +4337,53 @@
return;
v4l2_dbg(4, rkisp_debug, ¶ms_vdev->dev->v4l2_dev,
- "%s seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
- __func__, new_params->frame_id, module_en_update, module_ens);
+ "%s id:%d seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
+ __func__, id, new_params->frame_id, module_en_update, module_ens);
if (module_en_update & ISP32_MODULE_RAWAF)
- ops->rawaf_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAF));
+ ops->rawaf_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAF), id);
if ((module_en_update & ISP32_MODULE_RAWAE0) &&
!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32_L))
- ops->rawae0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE0));
+ ops->rawae0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE0), id);
if (module_en_update & ISP32_MODULE_RAWAE1)
- ops->rawae1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE1));
+ ops->rawae1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE1), id);
if (module_en_update & ISP32_MODULE_RAWAE2)
- ops->rawae2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE2));
+ ops->rawae2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE2), id);
if ((module_en_update & ISP32_MODULE_RAWAE3) &&
!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32))
- ops->rawae3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE3));
+ ops->rawae3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE3), id);
if (module_en_update & ISP32_MODULE_RAWHIST0)
- ops->rawhst0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST0));
+ ops->rawhst0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST0), id);
if (module_en_update & ISP32_MODULE_RAWHIST1)
- ops->rawhst1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST1));
+ ops->rawhst1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST1), id);
if (module_en_update & ISP32_MODULE_RAWHIST2)
- ops->rawhst2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST2));
+ ops->rawhst2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST2), id);
if (module_en_update & ISP32_MODULE_RAWHIST3)
- ops->rawhst3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST3));
+ ops->rawhst3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST3), id);
if (module_en_update & ISP32_MODULE_RAWAWB)
- ops->rawawb_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAWB));
-}
-
-static __maybe_unused
-void __isp_config_hdrshd(struct rkisp_isp_params_vdev *params_vdev)
-{
- struct rkisp_isp_params_ops_v32 *ops =
- (struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
- struct rkisp_isp_params_val_v32 *priv_val =
- (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
-
- ops->hdrmge_config(params_vdev, &priv_val->last_hdrmge, RKISP_PARAMS_SHD);
- ops->hdrdrc_config(params_vdev, &priv_val->last_hdrdrc, RKISP_PARAMS_SHD);
+ ops->rawawb_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAWB), id);
}
static
void rkisp_params_cfgsram_v32(struct rkisp_isp_params_vdev *params_vdev)
{
- struct isp32_isp_params_cfg *params = params_vdev->isp32_params;
+ u32 id = params_vdev->dev->unite_index;
+ struct isp32_isp_params_cfg *params = params_vdev->isp32_params + id;
- isp_lsc_matrix_cfg_sram(params_vdev, ¶ms->others.lsc_cfg, true);
- isp_rawhstbig_cfg_sram(params_vdev, ¶ms->meas.rawhist1, 1, true);
- isp_rawhstbig_cfg_sram(params_vdev, ¶ms->meas.rawhist2, 2, true);
- isp_rawhstbig_cfg_sram(params_vdev, ¶ms->meas.rawhist3, 0, true);
- isp_rawawb_cfg_sram(params_vdev, ¶ms->meas.rawawb, true);
+ isp_lsc_matrix_cfg_sram(params_vdev, ¶ms->others.lsc_cfg, true, id);
+ isp_rawhstbig_cfg_sram(params_vdev, ¶ms->meas.rawhist1, 1, true, id);
+ isp_rawhstbig_cfg_sram(params_vdev, ¶ms->meas.rawhist2, 2, true, id);
+ isp_rawhstbig_cfg_sram(params_vdev, ¶ms->meas.rawhist3, 0, true, id);
+ isp_rawawb_cfg_sram(params_vdev, ¶ms->meas.rawawb, true, id);
}
static int
@@ -4313,22 +4394,24 @@
struct rkisp_isp_subdev *isp_sdev = &dev->isp_sdev;
struct rkisp_isp_params_val_v32 *priv_val;
u64 module_en_update, module_ens;
- int ret, i;
+ int ret, i, id;
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
module_en_update = new_params->module_en_update;
module_ens = new_params->module_ens;
- priv_val->buf_3dlut_idx = 0;
- for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++) {
- if (priv_val->buf_3dlut[i].mem_priv)
- continue;
- priv_val->buf_3dlut[i].is_need_vaddr = true;
- priv_val->buf_3dlut[i].size = ISP32_3DLUT_BUF_SIZE;
- ret = rkisp_alloc_buffer(dev, &priv_val->buf_3dlut[i]);
- if (ret) {
- dev_err(dev->dev, "alloc 3dlut buf fail:%d\n", ret);
- goto err_3dlut;
+ for (id = 0; id <= !!dev->hw_dev->unite; id++) {
+ priv_val->buf_3dlut_idx[id] = 0;
+ for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++) {
+ if (priv_val->buf_3dlut[id][i].mem_priv)
+ continue;
+ priv_val->buf_3dlut[id][i].is_need_vaddr = true;
+ priv_val->buf_3dlut[id][i].size = ISP32_3DLUT_BUF_SIZE;
+ ret = rkisp_alloc_buffer(dev, &priv_val->buf_3dlut[id][i]);
+ if (ret) {
+ dev_err(dev->dev, "alloc 3dlut buf fail:%d\n", ret);
+ goto err_3dlut;
+ }
}
}
@@ -4343,6 +4426,9 @@
u32 h = ALIGN(isp_sdev->in_crop.height, 16);
u32 val, wrap_line, wsize, div;
bool is_alloc;
+
+ if (dev->hw_dev->unite)
+ w = ALIGN(isp_sdev->in_crop.width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL, 16);
priv_val->is_lo8x8 = (!new_params->others.bay3d_cfg.lo4x8_en &&
!new_params->others.bay3d_cfg.lo4x4_en);
@@ -4361,6 +4447,9 @@
wsize *= 2;
div = is_bwopt_dis ? 1 : 2;
val = ALIGN(wsize * h / div, 16);
+ priv_val->bay3d_iir_size = val;
+ if (dev->hw_dev->unite)
+ val *= 2;
is_alloc = true;
if (priv_val->buf_3dnr_iir.mem_priv) {
if (val > priv_val->buf_3dnr_iir.size)
@@ -4381,6 +4470,9 @@
val = w * h / div;
/* pixel to Byte and align */
val = ALIGN(val * 2, 16);
+ priv_val->bay3d_ds_size = val;
+ if (dev->hw_dev->unite)
+ val *= 2;
is_alloc = true;
if (priv_val->buf_3dnr_ds.mem_priv) {
if (val > priv_val->buf_3dnr_ds.size)
@@ -4413,8 +4505,7 @@
val = ALIGN(wsize * wrap_line / div, 16);
is_alloc = true;
if (priv_val->buf_3dnr_cur.mem_priv) {
- if (val > priv_val->buf_3dnr_cur.size ||
- val < dev->hw_dev->sram.size)
+ if (val > priv_val->buf_3dnr_cur.size || val < dev->hw_dev->sram.size)
rkisp_free_buffer(dev, &priv_val->buf_3dnr_cur);
else
is_alloc = false;
@@ -4440,6 +4531,8 @@
if (dev->isp_ver == ISP_V32_L) {
if (dev->hw_dev->is_frm_buf && !priv_val->buf_frm.mem_priv) {
priv_val->buf_frm.size = ISP32_LITE_FRM_BUF_SIZE;
+ if (dev->hw_dev->unite)
+ priv_val->buf_frm.size *= 2;
ret = rkisp_alloc_buffer(dev, &priv_val->buf_frm);
if (ret) {
dev_err(dev->dev, "alloc frm buf fail:%d\n", ret);
@@ -4469,10 +4562,14 @@
rkisp_free_buffer(dev, &priv_val->buf_3dnr_iir);
rkisp_free_buffer(dev, &priv_val->buf_3dnr_ds);
err_3dnr:
+ id = dev->hw_dev->unite ? 1 : 0;
i = ISP32_3DLUT_BUF_NUM;
err_3dlut:
- for (i -= 1; i >= 0; i--)
- rkisp_free_buffer(dev, &priv_val->buf_3dlut[i]);
+ for (; id >= 0; id--) {
+ for (i -= 1; i >= 0; i--)
+ rkisp_free_buffer(dev, &priv_val->buf_3dlut[id][i]);
+ i = ISP32_3DLUT_BUF_NUM;
+ }
return ret;
}
@@ -4664,6 +4761,8 @@
if (ispdev->isp_ver == ISP_V32_L)
return rkisp_params_check_bigmode_v32_lite(params_vdev);
+ if (hw->unite == ISP_UNITE_ONE)
+ hw->is_multi_overflow = true;
multi_overflow:
if (hw->is_multi_overflow) {
ispdev->multi_index = 0;
@@ -4831,6 +4930,7 @@
rkisp_params_first_cfg_v32(struct rkisp_isp_params_vdev *params_vdev)
{
struct rkisp_device *dev = params_vdev->dev;
+ struct rkisp_hw_dev *hw = dev->hw_dev;
struct rkisp_isp_params_val_v32 *priv_val =
(struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
@@ -4847,25 +4947,39 @@
priv_val->lsc_en = 0;
priv_val->mge_en = 0;
priv_val->lut3d_en = 0;
+ if (hw->unite) {
+ if (dev->is_bigmode)
+ rkisp_next_set_bits(dev, ISP3X_ISP_CTRL1, 0,
+ ISP3X_BIGMODE_MANUAL | ISP3X_BIGMODE_FORCE_EN, false);
+ __isp_isr_meas_config(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
+ __isp_isr_other_config(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
+ }
if (dev->is_bigmode)
- rkisp_set_bits(params_vdev->dev, ISP3X_ISP_CTRL1, 0,
+ rkisp_set_bits(dev, ISP3X_ISP_CTRL1, 0,
ISP3X_BIGMODE_MANUAL | ISP3X_BIGMODE_FORCE_EN, false);
- __isp_isr_meas_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
- __isp_isr_other_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
- __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
- __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
+ __isp_isr_meas_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
+ __isp_isr_other_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
- priv_val->cur_hdrmge = params_vdev->isp32_params->others.hdrmge_cfg;
- priv_val->cur_hdrdrc = params_vdev->isp32_params->others.drc_cfg;
- priv_val->last_hdrmge = priv_val->cur_hdrmge;
- priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
spin_unlock(¶ms_vdev->config_lock);
if (dev->hw_dev->is_frm_buf && priv_val->buf_frm.mem_priv) {
- isp3_param_write(params_vdev, priv_val->buf_frm.size, ISP32L_FRM_BUF_WR_SIZE);
- isp3_param_write(params_vdev, priv_val->buf_frm.dma_addr, ISP32L_FRM_BUF_WR_BASE);
- isp3_param_write(params_vdev, priv_val->buf_frm.dma_addr, ISP32L_FRM_BUF_RD_BASE);
+ u32 size = priv_val->buf_frm.size;
+ u32 addr = priv_val->buf_frm.dma_addr;
+
+ if (hw->unite) {
+ size /= 2;
+ isp3_param_write(params_vdev, size, ISP32L_FRM_BUF_WR_SIZE, 1);
+ isp3_param_write(params_vdev, addr + size, ISP32L_FRM_BUF_WR_BASE, 1);
+ isp3_param_write(params_vdev, addr + size, ISP32L_FRM_BUF_RD_BASE, 1);
+ }
+ isp3_param_write(params_vdev, size, ISP32L_FRM_BUF_WR_SIZE, 0);
+ isp3_param_write(params_vdev, addr, ISP32L_FRM_BUF_WR_BASE, 0);
+ isp3_param_write(params_vdev, addr, ISP32L_FRM_BUF_RD_BASE, 0);
}
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);
@@ -4879,11 +4993,15 @@
static void rkisp_clear_first_param_v32(struct rkisp_isp_params_vdev *params_vdev)
{
- memset(params_vdev->isp32_params, 0, sizeof(struct isp32_isp_params_cfg));
+ u32 size = sizeof(struct isp32_isp_params_cfg);
+
+ if (params_vdev->dev->hw_dev->unite)
+ size *= 2;
+ memset(params_vdev->isp32_params, 0, size);
}
static void rkisp_deinit_mesh_buf(struct rkisp_isp_params_vdev *params_vdev,
- u64 module_id)
+ u64 module_id, u32 id)
{
struct rkisp_isp_params_val_v32 *priv_val;
struct rkisp_dummy_buffer *buf;
@@ -4895,11 +5013,11 @@
switch (module_id) {
case ISP32_MODULE_CAC:
- buf = priv_val->buf_cac;
+ buf = priv_val->buf_cac[id];
break;
case ISP32_MODULE_LDCH:
default:
- buf = priv_val->buf_ldch;
+ buf = priv_val->buf_ldch[id];
break;
}
@@ -4919,6 +5037,7 @@
u32 mesh_h = meshsize->meas_height;
u32 mesh_size, buf_size;
int i, ret, buf_cnt = meshsize->buf_cnt;
+ int id = meshsize->unite_isp_id;
bool is_alloc;
priv_val = params_vdev->priv_val;
@@ -4929,16 +5048,16 @@
switch (meshsize->module_id) {
case ISP32_MODULE_CAC:
- priv_val->buf_cac_idx = 0;
- buf = priv_val->buf_cac;
+ priv_val->buf_cac_idx[id] = 0;
+ buf = priv_val->buf_cac[id];
mesh_w = (mesh_w + 62) / 64 * 9;
mesh_h = (mesh_h + 62) / 64 * 2;
mesh_size = mesh_w * 4 * mesh_h;
break;
case ISP32_MODULE_LDCH:
default:
- priv_val->buf_ldch_idx = 0;
- buf = priv_val->buf_ldch;
+ priv_val->buf_ldch_idx[id] = 0;
+ buf = priv_val->buf_ldch[id];
mesh_w = ((mesh_w + 15) / 16 + 2) / 2;
mesh_h = (mesh_h + 7) / 8 + 1;
mesh_size = mesh_w * 4 * mesh_h;
@@ -4979,7 +5098,7 @@
return 0;
err:
- rkisp_deinit_mesh_buf(params_vdev, meshsize->module_id);
+ rkisp_deinit_mesh_buf(params_vdev, meshsize->module_id, id);
return -ENOMEM;
}
@@ -4987,7 +5106,9 @@
rkisp_get_param_size_v32(struct rkisp_isp_params_vdev *params_vdev,
unsigned int sizes[])
{
- sizes[0] = sizeof(struct isp32_isp_params_cfg);
+ u32 mult = params_vdev->dev->hw_dev->unite ? 2 : 1;
+
+ sizes[0] = sizeof(struct isp32_isp_params_cfg) * mult;
}
static void
@@ -4997,18 +5118,18 @@
struct rkisp_isp_params_val_v32 *priv_val;
struct rkisp_meshbuf_info *meshbuf = meshbuf_inf;
struct rkisp_dummy_buffer *buf;
- int i;
+ int i, id = meshbuf->unite_isp_id;
priv_val = params_vdev->priv_val;
switch (meshbuf->module_id) {
case ISP32_MODULE_CAC:
- priv_val->buf_cac_idx = 0;
- buf = priv_val->buf_cac;
+ priv_val->buf_cac_idx[id] = 0;
+ buf = priv_val->buf_cac[id];
break;
case ISP32_MODULE_LDCH:
default:
- priv_val->buf_ldch_idx = 0;
- buf = priv_val->buf_ldch;
+ priv_val->buf_ldch_idx[id] = 0;
+ buf = priv_val->buf_ldch[id];
break;
}
@@ -5030,6 +5151,8 @@
{
struct rkisp_meshbuf_size *meshsize = size;
+ if (!params_vdev->dev->hw_dev->unite)
+ meshsize->unite_isp_id = 0;
return rkisp_init_mesh_buf(params_vdev, meshsize);
}
@@ -5037,7 +5160,10 @@
rkisp_params_free_meshbuf_v32(struct rkisp_isp_params_vdev *params_vdev,
u64 module_id)
{
- rkisp_deinit_mesh_buf(params_vdev, module_id);
+ int id;
+
+ for (id = 0; id <= !!params_vdev->dev->hw_dev->unite; id++)
+ rkisp_deinit_mesh_buf(params_vdev, module_id, id);
}
static int
@@ -5134,9 +5260,9 @@
cfg->buf_fd[i] = buf->dma_fd;
}
buf = &priv_val->buf_info[0];
- isp3_param_write(params_vdev, buf->dma_addr, ISP3X_MI_GAIN_WR_BASE);
- isp3_param_write(params_vdev, buf->size, ISP3X_MI_GAIN_WR_SIZE);
- isp3_param_write(params_vdev, wsize, ISP3X_MI_GAIN_WR_LENGTH);
+ isp3_param_write(params_vdev, buf->dma_addr, ISP3X_MI_GAIN_WR_BASE, 0);
+ isp3_param_write(params_vdev, buf->size, ISP3X_MI_GAIN_WR_SIZE, 0);
+ isp3_param_write(params_vdev, wsize, ISP3X_MI_GAIN_WR_LENGTH, 0);
if (dev->hw_dev->is_single)
rkisp_write(dev, ISP3X_MI_WR_CTRL2, ISP3X_GAINSELF_UPD, true);
rkisp_set_reg_cache_bits(dev, reg, mask, ctrl);
@@ -5164,7 +5290,7 @@
{
struct rkisp_device *ispdev = params_vdev->dev;
struct rkisp_isp_params_val_v32 *priv_val;
- int i;
+ int i, id;
priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
rkisp_free_buffer(ispdev, &priv_val->buf_frm);
@@ -5173,10 +5299,12 @@
rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_ds);
for (i = 0; i < ISP32_LSC_LUT_BUF_NUM; i++)
rkisp_free_buffer(ispdev, &priv_val->buf_lsclut[i]);
- for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++)
- rkisp_free_buffer(ispdev, &priv_val->buf_3dlut[i]);
for (i = 0; i < RKISP_STATS_DDR_BUF_NUM; i++)
rkisp_free_buffer(ispdev, &ispdev->stats_vdev.stats_buf[i]);
+ for (id = 0; id <= !!ispdev->hw_dev->unite; id++) {
+ for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++)
+ rkisp_free_buffer(ispdev, &priv_val->buf_3dlut[id][i]);
+ }
priv_val->buf_info_owner = 0;
priv_val->buf_info_cnt = 0;
priv_val->buf_info_idx = -1;
@@ -5187,8 +5315,12 @@
static void
rkisp_params_fop_release_v32(struct rkisp_isp_params_vdev *params_vdev)
{
- rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_LDCH);
- rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_CAC);
+ int id;
+
+ for (id = 0; id <= !!params_vdev->dev->hw_dev->unite; id++) {
+ rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_LDCH, id);
+ rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_CAC, id);
+ }
}
/* Not called when the camera active, thus not isr protection. */
@@ -5198,13 +5330,17 @@
params_vdev->isp32_params->module_ens = 0;
params_vdev->isp32_params->module_en_update = 0x7ffffffffff;
- __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
- __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
+ if (params_vdev->dev->hw_dev->unite) {
+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 1);
+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 1);
+ }
}
static void
module_data_abandon(struct rkisp_isp_params_vdev *params_vdev,
- struct isp32_isp_params_cfg *params)
+ struct isp32_isp_params_cfg *params, u32 id)
{
struct rkisp_isp_params_val_v32 *priv_val;
struct isp2x_mesh_head *mesh_head;
@@ -5215,9 +5351,9 @@
const struct isp32_ldch_cfg *arg = ¶ms->others.ldch_cfg;
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
- if (priv_val->buf_ldch[i].vaddr &&
- arg->buf_fd == priv_val->buf_ldch[i].dma_fd) {
- mesh_head = (struct isp2x_mesh_head *)priv_val->buf_ldch[i].vaddr;
+ if (priv_val->buf_ldch[id][i].vaddr &&
+ arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd) {
+ mesh_head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][i].vaddr;
mesh_head->stat = MESH_BUF_CHIPINUSE;
break;
}
@@ -5228,9 +5364,9 @@
const struct isp32_cac_cfg *arg = ¶ms->others.cac_cfg;
for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
- if (priv_val->buf_cac[i].vaddr &&
- arg->buf_fd == priv_val->buf_cac[i].dma_fd) {
- mesh_head = (struct isp2x_mesh_head *)priv_val->buf_cac[i].vaddr;
+ if (priv_val->buf_cac[id][i].vaddr &&
+ arg->buf_fd == priv_val->buf_cac[id][i].dma_fd) {
+ mesh_head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][i].vaddr;
mesh_head->stat = MESH_BUF_CHIPINUSE;
break;
}
@@ -5242,10 +5378,9 @@
rkisp_params_cfg_v32(struct rkisp_isp_params_vdev *params_vdev,
u32 frame_id, enum rkisp_params_type type)
{
+ struct rkisp_hw_dev *hw = params_vdev->dev->hw_dev;
struct isp32_isp_params_cfg *new_params = NULL;
struct rkisp_buffer *cur_buf = params_vdev->cur_buf;
- struct rkisp_device *dev = params_vdev->dev;
- struct rkisp_hw_dev *hw_dev = dev->hw_dev;
spin_lock(¶ms_vdev->config_lock);
if (!params_vdev->streamon)
@@ -5264,15 +5399,27 @@
else if (new_params->module_en_update ||
(new_params->module_cfg_update & ISP32_MODULE_FORCE)) {
/* update en immediately */
- __isp_isr_meas_config(params_vdev, new_params, type);
- __isp_isr_other_config(params_vdev, new_params, type);
- __isp_isr_other_en(params_vdev, new_params, type);
- __isp_isr_meas_en(params_vdev, new_params, type);
+ __isp_isr_meas_config(params_vdev, new_params, type, 0);
+ __isp_isr_other_config(params_vdev, new_params, type, 0);
+ __isp_isr_other_en(params_vdev, new_params, type, 0);
+ __isp_isr_meas_en(params_vdev, new_params, type, 0);
new_params->module_cfg_update = 0;
+ if (hw->unite) {
+ struct isp32_isp_params_cfg *params = new_params + 1;
+
+ __isp_isr_meas_config(params_vdev, params, type, 1);
+ __isp_isr_other_config(params_vdev, params, type, 1);
+ __isp_isr_other_en(params_vdev, params, type, 1);
+ __isp_isr_meas_en(params_vdev, params, type, 1);
+ params->module_cfg_update = 0;
+ }
}
if (new_params->module_cfg_update &
(ISP32_MODULE_LDCH | ISP32_MODULE_CAC)) {
- module_data_abandon(params_vdev, new_params);
+ module_data_abandon(params_vdev, new_params, 0);
+ if (hw->unite)
+ module_data_abandon(params_vdev, new_params, 1);
+
}
vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
cur_buf = NULL;
@@ -5289,22 +5436,21 @@
goto unlock;
new_params = (struct isp32_isp_params_cfg *)(cur_buf->vaddr[0]);
- __isp_isr_meas_config(params_vdev, new_params, type);
- __isp_isr_other_config(params_vdev, new_params, type);
- __isp_isr_other_en(params_vdev, new_params, type);
- __isp_isr_meas_en(params_vdev, new_params, type);
- if (!hw_dev->is_single && type != RKISP_PARAMS_SHD)
- __isp_config_hdrshd(params_vdev);
+ if (hw->unite) {
+ __isp_isr_meas_config(params_vdev, new_params + 1, type, 1);
+ __isp_isr_other_config(params_vdev, new_params + 1, type, 1);
+ __isp_isr_other_en(params_vdev, new_params + 1, type, 1);
+ __isp_isr_meas_en(params_vdev, new_params + 1, type, 1);
+ }
+ __isp_isr_meas_config(params_vdev, new_params, type, 0);
+ __isp_isr_other_config(params_vdev, new_params, type, 0);
+ __isp_isr_other_en(params_vdev, new_params, type, 0);
+ __isp_isr_meas_en(params_vdev, new_params, type, 0);
if (type != RKISP_PARAMS_IMD) {
- struct rkisp_isp_params_val_v32 *priv_val =
- (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
-
- priv_val->last_hdrmge = priv_val->cur_hdrmge;
- priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
- priv_val->cur_hdrmge = new_params->others.hdrmge_cfg;
- priv_val->cur_hdrdrc = new_params->others.drc_cfg;
new_params->module_cfg_update = 0;
+ if (hw->unite)
+ (new_params++)->module_cfg_update = 0;
vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
cur_buf = NULL;
}
@@ -5317,13 +5463,15 @@
static void
rkisp_params_clear_fstflg(struct rkisp_isp_params_vdev *params_vdev)
{
- u32 value = isp3_param_read(params_vdev, ISP3X_ISP_CTRL1);
+ u32 value = isp3_param_read(params_vdev, ISP3X_ISP_CTRL1, 0);
value &= (ISP3X_YNR_FST_FRAME | ISP3X_ADRC_FST_FRAME |
ISP3X_DHAZ_FST_FRAME | ISP3X_CNR_FST_FRAME |
- ISP3X_RAW3D_FST_FRAME);
+ ISP3X_RAW3D_FST_FRAME | ISP32_SHP_FST_FRAME);
if (value) {
- isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL1, value);
+ isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL1, value, 0);
+ if (params_vdev->dev->hw_dev->unite)
+ isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL1, value, 1);
}
}
@@ -5382,6 +5530,8 @@
return -ENOMEM;
size = sizeof(struct isp32_isp_params_cfg);
+ if (params_vdev->dev->hw_dev->unite)
+ size *= 2;
params_vdev->isp32_params = vmalloc(size);
if (!params_vdev->isp32_params) {
kfree(priv_val);
--
Gitblit v1.6.2