From 1543e317f1da31b75942316931e8f491a8920811 Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Thu, 04 Jan 2024 10:08:02 +0000
Subject: [PATCH] disable FB
---
kernel/drivers/media/platform/rockchip/isp/isp_params_v21.c | 381 ++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 268 insertions(+), 113 deletions(-)
diff --git a/kernel/drivers/media/platform/rockchip/isp/isp_params_v21.c b/kernel/drivers/media/platform/rockchip/isp/isp_params_v21.c
index a1592d8..e13e97c 100644
--- a/kernel/drivers/media/platform/rockchip/isp/isp_params_v21.c
+++ b/kernel/drivers/media/platform/rockchip/isp/isp_params_v21.c
@@ -460,10 +460,9 @@
{
int i, j;
unsigned int sram_addr;
- unsigned int data;
+ unsigned int data = rkisp_ioread32(params_vdev, ISP_LSC_CTRL);
- if (is_check &&
- !(rkisp_ioread32(params_vdev, ISP_LSC_CTRL) & ISP_LSC_EN))
+ if (is_check && (data & ISP_LSC_LUT_EN || !(data & ISP_LSC_EN)))
return;
/* CIF_ISP_LSC_TABLE_ADDRESS_153 = ( 17 * 18 ) >> 1 */
@@ -603,12 +602,13 @@
* readback mode lsc lut AHB config to sram, once for single device,
* need record to switch for multi-device.
*/
- if (!IS_HDR_RDBK(dev->rd_mode))
+ 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);
- else
+ } else {
+ if (dev->hw_dev->is_single)
+ isp_lsc_matrix_cfg_sram(params_vdev, arg, false);
params_rec->others.lsc_cfg = *arg;
+ }
for (i = 0; i < 4; i++) {
/* program x size tables */
@@ -1178,6 +1178,12 @@
ISP2X_REG_WR_MASK);
wnd_num_idx = arg->wnd_num;
+ if (wnd_num_idx >= ARRAY_SIZE(ae_wnd_num)) {
+ wnd_num_idx = ARRAY_SIZE(ae_wnd_num) - 1;
+ dev_err(params_vdev->dev->dev,
+ "%s invalid wnd_num:%d, set to %d\n",
+ __func__, arg->wnd_num, wnd_num_idx);
+ }
value |= ISP2X_RAWAEBIG_WNDNUM_SET(wnd_num_idx);
if (arg->subwin_en[0])
@@ -1327,8 +1333,8 @@
(arg->sw_rawawb_wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 |
(arg->sw_rawawb_wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 |
(arg->sw_rawawb_wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 |
- (arg->sw_rawawb_wp_blk_wei_w[5 * i + 4] & 0x3f) << 24,
- rkisp_iowrite32(params_vdev, val, ISP21_RAWAWB_WRAM_DATA_BASE);
+ (arg->sw_rawawb_wp_blk_wei_w[5 * i + 4] & 0x3f) << 24;
+ rkisp_write(params_vdev->dev, ISP21_RAWAWB_WRAM_DATA_BASE, val, true);
}
}
@@ -2143,10 +2149,9 @@
if (params_vdev->dev->hw_dev->is_single)
isp_rawawb_cfg_sram(params_vdev, arg, false);
- else
- memcpy(arg_rec->sw_rawawb_wp_blk_wei_w,
- arg->sw_rawawb_wp_blk_wei_w,
- ISP21_RAWAWB_WEIGHT_NUM);
+ memcpy(arg_rec->sw_rawawb_wp_blk_wei_w,
+ arg->sw_rawawb_wp_blk_wei_w,
+ ISP21_RAWAWB_WEIGHT_NUM);
/* avoid to override the old enable value */
value = rkisp_ioread32(params_vdev, ISP21_RAWAWB_CTRL);
@@ -2292,6 +2297,12 @@
return;
wnd_num_idx = arg->wnd_num;
+ if (wnd_num_idx >= ARRAY_SIZE(hist_wnd_num)) {
+ wnd_num_idx = ARRAY_SIZE(hist_wnd_num) - 1;
+ dev_err(params_vdev->dev->dev,
+ "%s invalid wnd_num:%d, set to %d\n",
+ __func__, arg->wnd_num, wnd_num_idx);
+ }
memset(weight15x15, 0, sizeof(weight15x15));
for (i = 0; i < hist_wnd_num[wnd_num_idx]; i++) {
for (j = 0; j < hist_wnd_num[wnd_num_idx]; j++) {
@@ -2339,6 +2350,12 @@
}
wnd_num_idx = arg->wnd_num;
+ if (wnd_num_idx >= ARRAY_SIZE(hist_wnd_num)) {
+ wnd_num_idx = ARRAY_SIZE(hist_wnd_num) - 1;
+ dev_err(params_vdev->dev->dev,
+ "%s invalid wnd_num:%d, set to %d\n",
+ __func__, arg->wnd_num, wnd_num_idx);
+ }
/* avoid to override the old enable value */
hist_ctrl = rkisp_ioread32(params_vdev, addr + ISP_RAWHIST_BIG_CTRL);
hist_ctrl &= ISP2X_RAWHSTBIG_CTRL_EN_MASK;
@@ -2370,8 +2387,7 @@
if (dev->hw_dev->is_single)
isp_rawhstbig_cfg_sram(params_vdev, arg, blk_no, false);
- else
- *arg_rec = *arg;
+ *arg_rec = *arg;
}
static void
@@ -3324,7 +3340,7 @@
isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
const struct isp21_csm_cfg *arg)
{
- u32 i, val, eff_ctrl, cproc_ctrl;
+ u32 i, val;
for (i = 0; i < ISP21_CSM_COEFF_NUM; i++) {
if (i == 0)
@@ -3337,32 +3353,7 @@
}
val = CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA | CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
- if (arg->csm_full_range) {
- params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
- isp_param_set_bits(params_vdev, ISP_CTRL, val);
- } else {
- params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
- isp_param_clear_bits(params_vdev, ISP_CTRL, val);
- }
-
- eff_ctrl = rkisp_ioread32(params_vdev, CIF_IMG_EFF_CTRL);
- if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
- if (arg->csm_full_range)
- eff_ctrl |= CIF_IMG_EFF_CTRL_YCBCR_FULL;
- else
- eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
- rkisp_iowrite32(params_vdev, eff_ctrl, CIF_IMG_EFF_CTRL);
- }
-
- cproc_ctrl = rkisp_ioread32(params_vdev, CPROC_CTRL);
- 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 (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE || !arg->csm_full_range)
- cproc_ctrl &= ~val;
- else
- cproc_ctrl |= val;
- rkisp_iowrite32(params_vdev, cproc_ctrl, CPROC_CTRL);
- }
+ isp_param_set_bits(params_vdev, ISP_CTRL, val);
}
static void
@@ -3370,13 +3361,36 @@
const struct isp21_cgc_cfg *arg)
{
u32 val = rkisp_ioread32(params_vdev, ISP_CTRL);
+ u32 eff_ctrl, cproc_ctrl;
+ params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
val &= ~(ISP21_CGC_YUV_LIMIT | ISP21_CGC_RATIO_EN);
- if (arg->yuv_limit)
+ if (arg->yuv_limit) {
val |= ISP21_CGC_YUV_LIMIT;
+ params_vdev->quantization = V4L2_QUANTIZATION_LIM_RANGE;
+ }
if (arg->ratio_en)
val |= ISP21_CGC_RATIO_EN;
rkisp_iowrite32(params_vdev, val, ISP_CTRL);
+
+ cproc_ctrl = rkisp_ioread32(params_vdev, CPROC_CTRL);
+ 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;
+ rkisp_iowrite32(params_vdev, cproc_ctrl, CPROC_CTRL);
+ }
+
+ eff_ctrl = rkisp_ioread32(params_vdev, CIF_IMG_EFF_CTRL);
+ 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;
+ rkisp_iowrite32(params_vdev, eff_ctrl, CIF_IMG_EFF_CTRL);
+ }
}
struct rkisp_isp_params_v21_ops rkisp_v21_isp_params_ops = {
@@ -3488,11 +3502,12 @@
if ((module_cfg_update & ISP2X_MODULE_GOC))
ops->goc_config(params_vdev, &new_params->others.gammaout_cfg);
- if ((module_cfg_update & ISP2X_MODULE_CGC))
- ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
-
+ /* range csm->cgc->cproc->ie */
if ((module_cfg_update & ISP2X_MODULE_CSM))
ops->csm_config(params_vdev, &new_params->others.csm_cfg);
+
+ if ((module_cfg_update & ISP2X_MODULE_CGC))
+ ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
if ((module_cfg_update & ISP2X_MODULE_CPROC))
ops->cproc_config(params_vdev, &new_params->others.cproc_cfg);
@@ -3741,19 +3756,6 @@
ops->rawaf_enable(params_vdev, !!(module_ens & ISP2X_MODULE_RAWAF));
}
-static __maybe_unused
-void __isp_config_hdrshd(struct rkisp_isp_params_vdev *params_vdev)
-{
- struct rkisp_isp_params_v21_ops *ops =
- (struct rkisp_isp_params_v21_ops *)params_vdev->priv_ops;
- struct rkisp_isp_params_val_v21 *priv_val =
- (struct rkisp_isp_params_val_v21 *)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);
-}
-
static
void rkisp_params_cfgsram_v21(struct rkisp_isp_params_vdev *params_vdev)
{
@@ -3794,42 +3796,197 @@
}
}
+static bool
+rkisp_params_check_bigmode_v21(struct rkisp_isp_params_vdev *params_vdev)
+{
+ struct rkisp_device *ispdev = params_vdev->dev;
+ struct device *dev = params_vdev->dev->dev;
+ struct rkisp_hw_dev *hw = params_vdev->dev->hw_dev;
+ struct v4l2_rect *crop = ¶ms_vdev->dev->isp_sdev.in_crop;
+ u32 width = hw->max_in.w, height = hw->max_in.h, size = width * height;
+ u32 bigmode_max_w, bigmode_max_size;
+ int k = 0, idx1[DEV_MAX] = { 0 };
+ int n = 0, idx2[DEV_MAX] = { 0 };
+ int i = 0, j = 0;
+ bool is_bigmode = false;
+
+multi_overflow:
+ if (hw->is_multi_overflow) {
+ ispdev->multi_index = 0;
+ ispdev->multi_mode = 0;
+ bigmode_max_w = ISP21_AUTO_BIGMODE_WIDTH;
+ bigmode_max_size = ISP21_NOBIG_OVERFLOW_SIZE;
+ dev_warn(dev, "over virtual isp max resolution, force to 2 readback\n");
+ goto end;
+ }
+
+ switch (hw->dev_link_num) {
+ case 4:
+ bigmode_max_w = ISP21_VIR4_AUTO_BIGMODE_WIDTH;
+ bigmode_max_size = ISP21_VIR4_NOBIG_OVERFLOW_SIZE;
+ ispdev->multi_index = ispdev->dev_id;
+ ispdev->multi_mode = 2;
+ /* internal buf of hw divided to four parts
+ * bigmode nobigmode
+ * _________ max width:1920 max width:960
+ * |_sensor0_| max size:1920*1080 max size:960*540
+ * |_sensor1_| max size:1920*1080 max size:960*540
+ * |_sensor2_| max size:1920*1080 max size:960*540
+ * |_sensor3_| max size:1920*1080 max size:960*540
+ */
+ for (i = 0; i < hw->dev_num; i++) {
+ if (hw->isp_size[i].w <= ISP21_VIR4_MAX_WIDTH &&
+ hw->isp_size[i].size <= ISP21_VIR4_MAX_SIZE)
+ continue;
+ dev_warn(dev, "isp%d %dx%d over four vir isp max:1920x1080\n",
+ i, hw->isp_size[i].w, hw->isp_size[i].h);
+ hw->is_multi_overflow = true;
+ goto multi_overflow;
+ }
+ break;
+ case 3:
+ bigmode_max_w = ISP21_VIR4_AUTO_BIGMODE_WIDTH;
+ bigmode_max_size = ISP21_VIR4_NOBIG_OVERFLOW_SIZE;
+ ispdev->multi_index = ispdev->dev_id;
+ ispdev->multi_mode = 2;
+ /* case0: bigmode nobigmode
+ * _________ max width:1920 max width:960
+ * |_sensor0_| max size:1920*1080 max size:960*540
+ * |_sensor1_| max size:1920*1080 max size:960*540
+ * |_sensor2_| max size:1920*1080 max size:960*540
+ * |_________|
+ *
+ * case1: bigmode special reg cfg
+ * _________ max width:3840
+ * | sensor0 | max size:3840*2160 mode=1 index=0
+ * |_________|
+ * |_sensor1_| max size:1920*1080 mode=2 index=2
+ * |_sensor2_| max size:1920*1080 mode=2 index=3
+ * max width:1920
+ */
+ for (i = 0; i < hw->dev_num; i++) {
+ if (!hw->isp_size[i].size) {
+ if (i < hw->dev_link_num)
+ idx2[n++] = i;
+ continue;
+ }
+ if (hw->isp_size[i].w <= ISP21_VIR4_MAX_WIDTH &&
+ hw->isp_size[i].size <= ISP21_VIR4_MAX_SIZE)
+ continue;
+ idx1[k++] = i;
+ }
+ if (k) {
+ is_bigmode = true;
+ if (k != 1 ||
+ (hw->isp_size[idx1[0]].size > ISP21_VIR2_MAX_SIZE)) {
+ dev_warn(dev, "isp%d %dx%d over three vir isp max:1920x1080\n",
+ idx1[0], hw->isp_size[idx1[0]].h, hw->isp_size[idx1[0]].w);
+ hw->is_multi_overflow = true;
+ goto multi_overflow;
+ } else {
+ if (idx1[0] == ispdev->dev_id) {
+ ispdev->multi_mode = 1;
+ ispdev->multi_index = 0;
+ } else {
+ ispdev->multi_mode = 2;
+ if (ispdev->multi_index == 0 ||
+ ispdev->multi_index == 1)
+ ispdev->multi_index = 3;
+ }
+ }
+ } else if (ispdev->multi_index >= hw->dev_link_num) {
+ ispdev->multi_index = idx2[ispdev->multi_index - hw->dev_link_num];
+ }
+ break;
+ case 2:
+ bigmode_max_w = ISP21_VIR2_AUTO_BIGMODE_WIDTH;
+ bigmode_max_size = ISP21_VIR2_NOBIG_OVERFLOW_SIZE;
+ ispdev->multi_index = ispdev->dev_id;
+ ispdev->multi_mode = 1;
+ /* case0: bigmode nobigmode
+ * _________ max width:3840 max width:1920
+ * | sensor0 | max size:3840*2160 max size:1920*1080
+ * |_________|
+ * | sensor1 | max size:3840*2160 max size:1920*1080
+ * |_________|
+ *
+ * case1: bigmode special reg cfg
+ * _________ max width:4096
+ * | sensor0 | max size: mode=0 index=0
+ * | | 3840*2160+1920*1080
+ * |_________|
+ * |_sensor1_| max size:1920*1080 mode=2 index=3
+ * max width:1920
+ */
+ for (i = 0; i < hw->dev_num; i++) {
+ if (!hw->isp_size[i].size) {
+ if (i < hw->dev_link_num)
+ idx2[n++] = i;
+ continue;
+ }
+ if (hw->isp_size[i].w <= ISP21_VIR2_MAX_WIDTH &&
+ hw->isp_size[i].size <= ISP21_VIR2_MAX_SIZE) {
+ if (hw->isp_size[i].w > ISP21_VIR4_MAX_WIDTH ||
+ hw->isp_size[i].size > ISP21_VIR4_MAX_SIZE)
+ j++;
+ continue;
+ }
+ idx1[k++] = i;
+ }
+ if (k) {
+ is_bigmode = true;
+ if (k == 2 || j ||
+ hw->isp_size[idx1[k - 1]].size > (ISP21_VIR4_MAX_SIZE + ISP21_VIR2_MAX_SIZE)) {
+ dev_warn(dev, "isp%d %dx%d over two vir isp max:3840x2160\n",
+ idx1[k - 1], hw->isp_size[idx1[k - 1]].w, hw->isp_size[idx1[k - 1]].h);
+ hw->is_multi_overflow = true;
+ goto multi_overflow;
+ } else {
+ if (idx1[0] == ispdev->dev_id) {
+ ispdev->multi_mode = 0;
+ ispdev->multi_index = 0;
+ } else {
+ ispdev->multi_mode = 2;
+ ispdev->multi_index = 3;
+ }
+ }
+ } else if (ispdev->multi_index >= hw->dev_link_num) {
+ ispdev->multi_index = idx2[ispdev->multi_index - hw->dev_link_num];
+ }
+ break;
+ default:
+ bigmode_max_w = ISP21_AUTO_BIGMODE_WIDTH;
+ bigmode_max_size = ISP21_NOBIG_OVERFLOW_SIZE;
+ ispdev->multi_mode = 0;
+ ispdev->multi_index = 0;
+ width = crop->width;
+ height = crop->height;
+ size = width * height;
+ break;
+ }
+
+end:
+ if (!is_bigmode &&
+ (width > bigmode_max_w || size > bigmode_max_size))
+ is_bigmode = true;
+
+ return ispdev->is_bigmode = is_bigmode;
+}
+
/* Not called when the camera active, thus not isr protection. */
static void
rkisp_params_first_cfg_v2x(struct rkisp_isp_params_vdev *params_vdev)
{
- struct device *dev = params_vdev->dev->dev;
+ struct rkisp_device *dev = params_vdev->dev;
struct rkisp_isp_params_val_v21 *priv_val =
(struct rkisp_isp_params_val_v21 *)params_vdev->priv_val;
- struct rkisp_hw_dev *hw = params_vdev->dev->hw_dev;
- struct v4l2_rect *out_crop = ¶ms_vdev->dev->isp_sdev.out_crop;
- u32 width = hw->max_in.w ? hw->max_in.w : out_crop->width;
- u32 height = hw->max_in.h ? hw->max_in.h : out_crop->height;
- u32 size = width * height;
- u32 bigmode_max_w, bigmode_max_size;
- if (hw->dev_num > 2) {
- bigmode_max_w = ISP21_VIR4_AUTO_BIGMODE_WIDTH;
- bigmode_max_size = ISP21_VIR4_NOBIG_OVERFLOW_SIZE;
- if (width > ISP21_VIR4_MAX_WIDTH || size > ISP21_VIR4_MAX_SIZE)
- dev_err(dev, "%dx%d > max:3840x2160 for %d virtual isp\n",
- width, height, hw->dev_num);
- } else if (hw->dev_num > 1) {
- bigmode_max_w = ISP21_VIR2_AUTO_BIGMODE_WIDTH;
- bigmode_max_size = ISP21_VIR2_NOBIG_OVERFLOW_SIZE;
- if (width > ISP21_VIR2_MAX_WIDTH || size > ISP21_VIR2_MAX_SIZE)
- dev_err(dev, "%dx%d > max:1920x1080 for %d virtual isp\n",
- width, height, hw->dev_num);
- } else {
- bigmode_max_w = ISP21_AUTO_BIGMODE_WIDTH;
- bigmode_max_size = ISP21_NOBIG_OVERFLOW_SIZE;
- }
-
+ dev->is_bigmode = rkisp_params_check_bigmode_v21(params_vdev);
spin_lock(¶ms_vdev->config_lock);
/* override the default things */
if (!params_vdev->isp21_params->module_cfg_update &&
!params_vdev->isp21_params->module_en_update)
- dev_warn(dev, "can not get first iq setting in stream on\n");
+ dev_warn(dev->dev, "can not get first iq setting in stream on\n");
priv_val->dhaz_en = 0;
priv_val->wdr_en = 0;
@@ -3840,16 +3997,10 @@
__isp_isr_other_config(params_vdev, params_vdev->isp21_params, RKISP_PARAMS_ALL);
__isp_isr_other_en(params_vdev, params_vdev->isp21_params, RKISP_PARAMS_ALL);
__isp_isr_meas_en(params_vdev, params_vdev->isp21_params, RKISP_PARAMS_ALL);
- if (width > bigmode_max_w || size > bigmode_max_size) {
+ if (dev->is_bigmode)
rkisp_set_bits(params_vdev->dev, ISP_CTRL1,
ISP2X_SYS_BIGMODE_MANUAL | ISP2X_SYS_BIGMODE_FORCEEN,
ISP2X_SYS_BIGMODE_MANUAL | ISP2X_SYS_BIGMODE_FORCEEN, false);
- }
-
- priv_val->cur_hdrmge = params_vdev->isp21_params->others.hdrmge_cfg;
- priv_val->cur_hdrdrc = params_vdev->isp21_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);
}
@@ -3958,14 +4109,21 @@
}
}
-static void
+static int
rkisp_params_set_ldchbuf_size_v2x(struct rkisp_isp_params_vdev *params_vdev,
void *size)
{
struct rkisp_ldchbuf_size *ldchsize = size;
rkisp_deinit_ldch_buf(params_vdev);
- rkisp_init_ldch_buf(params_vdev, ldchsize);
+ return rkisp_init_ldch_buf(params_vdev, ldchsize);
+}
+
+static void
+rkisp_params_free_meshbuf_v21(struct rkisp_isp_params_vdev *params_vdev,
+ u64 module_id)
+{
+ rkisp_deinit_ldch_buf(params_vdev);
}
static void
@@ -4050,8 +4208,6 @@
{
struct isp21_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)
@@ -4067,10 +4223,14 @@
list_del(&cur_buf->queue);
if (list_empty(¶ms_vdev->params))
break;
- else if (new_params->module_en_update) {
+ else if (new_params->module_en_update ||
+ (new_params->module_cfg_update & ISP2X_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);
+ new_params->module_cfg_update = 0;
}
if (new_params->module_cfg_update & ISP2X_MODULE_LDCH)
ldch_data_abandon(params_vdev, new_params);
@@ -4093,17 +4253,9 @@
__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 (type != RKISP_PARAMS_IMD) {
- struct rkisp_isp_params_val_v21 *priv_val =
- (struct rkisp_isp_params_val_v21 *)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;
vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
cur_buf = NULL;
}
@@ -4174,8 +4326,10 @@
.param_cfgsram = rkisp_params_cfgsram_v21,
.get_meshbuf_inf = rkisp_params_get_ldchbuf_inf_v2x,
.set_meshbuf_size = rkisp_params_set_ldchbuf_size_v2x,
+ .free_meshbuf = rkisp_params_free_meshbuf_v21,
.stream_stop = rkisp_params_stream_stop_v2x,
.fop_release = rkisp_params_fop_release_v2x,
+ .check_bigmode = rkisp_params_check_bigmode_v21,
};
int rkisp_init_params_vdev_v21(struct rkisp_isp_params_vdev *params_vdev)
@@ -4201,7 +4355,7 @@
ret = rkisp_alloc_buffer(params_vdev->dev, &priv_val->buf_3dlut[i]);
if (ret) {
dev_err(dev, "can not alloc buffer\n");
- goto err;
+ goto err_3dlut;
}
}
@@ -4212,7 +4366,7 @@
ret = rkisp_alloc_buffer(params_vdev->dev, &priv_val->buf_lsclut[i]);
if (ret) {
dev_err(dev, "can not alloc buffer\n");
- goto err;
+ goto err_lsclut;
}
}
@@ -4221,15 +4375,16 @@
params_vdev->priv_ops = &rkisp_v21_isp_params_ops;
rkisp_clear_first_param_v2x(params_vdev);
return 0;
-
-err:
- for (i = 0; i < RKISP_PARAM_3DLUT_BUF_NUM; i++)
+err_lsclut:
+ for (i -= 1; i >= 0; i--)
+ rkisp_free_buffer(params_vdev->dev, &priv_val->buf_lsclut[i]);
+ i = RKISP_PARAM_3DLUT_BUF_NUM;
+err_3dlut:
+ for (i -= 1; i >= 0; i--)
rkisp_free_buffer(params_vdev->dev, &priv_val->buf_3dlut[i]);
- for (i = 0; i < RKISP_PARAM_LSC_LUT_BUF_NUM; i++)
- rkisp_free_buffer(params_vdev->dev, &priv_val->buf_lsclut[i]);
vfree(params_vdev->isp21_params);
-
+ kfree(priv_val);
return ret;
}
--
Gitblit v1.6.2