From 2f7c68cb55ecb7331f2381deb497c27155f32faf Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Wed, 03 Jan 2024 09:43:39 +0000
Subject: [PATCH] update kernel to 5.10.198

---
 kernel/drivers/media/platform/rockchip/ispp/params.c |  852 +++-----------------------------------------------------
 1 files changed, 54 insertions(+), 798 deletions(-)

diff --git a/kernel/drivers/media/platform/rockchip/ispp/params.c b/kernel/drivers/media/platform/rockchip/ispp/params.c
index d064a61..af5fddd 100644
--- a/kernel/drivers/media/platform/rockchip/ispp/params.c
+++ b/kernel/drivers/media/platform/rockchip/ispp/params.c
@@ -7,602 +7,13 @@
 #include <media/videobuf2-vmalloc.h>
 #include <media/v4l2-event.h>
 #include <media/v4l2-mc.h>
-#include <linux/rkisp1-config.h>
+#include <linux/rk-isp1-config.h>
+#include <uapi/linux/rk-video-format.h>
 #include "dev.h"
 #include "regs.h"
 
 #define RKISP1_ISP_PARAMS_REQ_BUFS_MIN	2
 #define RKISP1_ISP_PARAMS_REQ_BUFS_MAX	8
-
-#define ISPP_PACK_4BIT(a, b, c, d, e, f, g, h) \
-	(((a) & 0xf) << 0 | ((b) & 0xf) << 4 | \
-	 ((c) & 0xf) << 8 | ((d) & 0xf) << 12 | \
-	 ((e) & 0xf) << 16 | ((f) & 0xf) << 20 | \
-	 ((g) & 0xf) << 24 | ((h) & 0xf) << 28)
-
-#define ISPP_PACK_4BYTE(a, b, c, d) \
-	(((a) & 0xFF) << 0 | ((b) & 0xFF) << 8 | \
-	 ((c) & 0xFF) << 16 | ((d) & 0xFF) << 24)
-
-#define ISPP_PACK_2SHORT(a, b) \
-	(((a) & 0xFFFF) << 0 | ((b) & 0xFFFF) << 16)
-
-#define ISPP_NOBIG_OVERFLOW_SIZE	(2560 * 1440)
-
-static inline size_t get_input_size(struct rkispp_params_vdev *params_vdev)
-{
-	struct rkispp_device *dev = params_vdev->dev;
-	struct rkispp_subdev *isp_sdev = &dev->ispp_sdev;
-
-	return isp_sdev->out_fmt.width * isp_sdev->out_fmt.height;
-}
-
-static void tnr_config(struct rkispp_params_vdev *params_vdev,
-		       struct rkispp_tnr_config *arg)
-{
-	u32 i, val;
-
-	val = arg->opty_en << 2 | arg->optc_en << 3 |
-		arg->gain_en << 4;
-	rkispp_set_bits(params_vdev->dev, RKISPP_TNR_CORE_CTRL,
-			SW_TNR_OPTY_EN | SW_TNR_OPTC_EN |
-			SW_TNR_GLB_GAIN_EN, val);
-
-	val = ISPP_PACK_4BYTE(arg->pk0_y, arg->pk1_y,
-		arg->pk0_c, arg->pk1_c);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_PK0, val);
-
-	val = ISPP_PACK_2SHORT(arg->glb_gain_cur, arg->glb_gain_nxt);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GLB_GAIN, val);
-	val = ISPP_PACK_2SHORT(arg->glb_gain_cur_div, arg->glb_gain_cur_sqrt);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GLB_GAIN_DIV, val);
-
-	for (i = 0; i < TNR_SIGMA_CURVE_SIZE - 1; i += 2)
-		rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SIG_Y01 + i * 2,
-			ISPP_PACK_2SHORT(arg->sigma_y[i], arg->sigma_y[i + 1]));
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SIG_Y10, arg->sigma_y[16]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SIG_X18,
-		ISPP_PACK_4BIT(arg->sigma_x[0], arg->sigma_x[1],
-			arg->sigma_x[2], arg->sigma_x[3],
-			arg->sigma_x[4], arg->sigma_x[5],
-			arg->sigma_x[6], arg->sigma_x[7]));
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SIG_X910,
-		ISPP_PACK_4BIT(arg->sigma_x[8], arg->sigma_x[9],
-			arg->sigma_x[10], arg->sigma_x[11],
-			arg->sigma_x[12], arg->sigma_x[13],
-			arg->sigma_x[14], arg->sigma_x[15]));
-
-	for (i = 0; i < TNR_LUMA_CURVE_SIZE; i += 2) {
-		val = ISPP_PACK_2SHORT(arg->luma_curve[i], arg->luma_curve[i + 1]);
-		rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_LUMACURVE_Y01 + i * 2, val);
-	}
-
-	val = ISPP_PACK_2SHORT(arg->txt_th0_y, arg->txt_th1_y);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_TH_Y, val);
-	val = ISPP_PACK_2SHORT(arg->txt_th0_c, arg->txt_th1_c);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_TH_C, val);
-	val = ISPP_PACK_2SHORT(arg->txt_thy_dlt, arg->txt_thc_dlt);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_TH_DLT, val);
-
-	val = ISPP_PACK_4BYTE(arg->gfcoef_y0[0], arg->gfcoef_y0[1],
-		arg->gfcoef_y0[2], arg->gfcoef_y0[3]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_Y0_0, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_y0[4], arg->gfcoef_y0[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_Y0_1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_y1[0], arg->gfcoef_y1[1],
-		arg->gfcoef_y1[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_Y1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_y2[0], arg->gfcoef_y2[1],
-		arg->gfcoef_y2[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_Y2, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_y3[0], arg->gfcoef_y3[1],
-		arg->gfcoef_y3[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_Y3, val);
-
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yg0[0], arg->gfcoef_yg0[1],
-		arg->gfcoef_yg0[2], arg->gfcoef_yg0[3]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YG0_0, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yg0[4], arg->gfcoef_yg0[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YG0_1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yg1[0], arg->gfcoef_yg1[1],
-		arg->gfcoef_yg1[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YG1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yg2[0], arg->gfcoef_yg2[1],
-		arg->gfcoef_yg2[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YG2, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yg3[0], arg->gfcoef_yg3[1],
-		arg->gfcoef_yg3[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YG3, val);
-
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yl0[0], arg->gfcoef_yl0[1],
-		arg->gfcoef_yl0[2], arg->gfcoef_yl0[3]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YL0_0, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yl0[4], arg->gfcoef_yl0[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YL0_1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yl1[0], arg->gfcoef_yl1[1],
-		arg->gfcoef_yl1[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YL1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_yl2[0], arg->gfcoef_yl2[1],
-		arg->gfcoef_yl2[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_YL2, val);
-
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cg0[0], arg->gfcoef_cg0[1],
-		arg->gfcoef_cg0[2], arg->gfcoef_cg0[3]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CG0_0, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cg0[4], arg->gfcoef_cg0[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CG0_1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cg1[0], arg->gfcoef_cg1[1],
-		arg->gfcoef_cg1[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CG1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cg2[0], arg->gfcoef_cg2[1],
-		arg->gfcoef_cg2[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CG2, val);
-
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cl0[0], arg->gfcoef_cl0[1],
-		arg->gfcoef_cl0[2], arg->gfcoef_cl0[3]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CL0_0, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cl0[4], arg->gfcoef_cl0[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CL0_1, val);
-	val = ISPP_PACK_4BYTE(arg->gfcoef_cl1[0], arg->gfcoef_cl1[1],
-		arg->gfcoef_cl1[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_GFCOEF_CL1, val);
-
-	val = ISPP_PACK_2SHORT(arg->scale_yg[0], arg->scale_yg[1]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_YG01, val);
-	val = ISPP_PACK_2SHORT(arg->scale_yg[2], arg->scale_yg[3]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_YG23, val);
-	val = ISPP_PACK_2SHORT(arg->scale_yl[0], arg->scale_yl[1]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_YL01, val);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_YL2, arg->scale_yl[2]);
-	val = ISPP_PACK_2SHORT(arg->scale_cg[0], arg->scale_y2cg[0]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_CG0, val);
-	val = ISPP_PACK_2SHORT(arg->scale_cg[1], arg->scale_y2cg[1]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_CG1, val);
-	val = ISPP_PACK_2SHORT(arg->scale_cg[2], arg->scale_y2cg[2]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_CG2, val);
-	val = ISPP_PACK_2SHORT(arg->scale_cl[0], arg->scale_y2cl[0]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_CL0, val);
-	val = ISPP_PACK_2SHORT(arg->scale_cl[1], arg->scale_y2cl[1]);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_CL1, val);
-	val = arg->scale_y2cl[2] << 16;
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_SCALE_CL2, val);
-	val = ISPP_PACK_4BYTE(arg->weight_y[0], arg->weight_y[1],
-		arg->weight_y[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_TNR_CORE_WEIGHT, val);
-}
-
-static bool is_tnr_enable(struct rkispp_params_vdev *params_vdev)
-{
-	u32 cur_en;
-
-	cur_en = rkispp_read(params_vdev->dev, RKISPP_TNR_CORE_CTRL);
-	cur_en &= SW_TNR_EN;
-
-	return (!!cur_en);
-}
-
-static void tnr_enable(struct rkispp_params_vdev *params_vdev, bool en)
-{
-	if (en && !is_tnr_enable(params_vdev))
-		rkispp_set_bits(params_vdev->dev, RKISPP_TNR_CTRL, 0, SW_TNR_1ST_FRM);
-	rkispp_set_bits(params_vdev->dev, RKISPP_TNR_CORE_CTRL, SW_TNR_EN, en);
-}
-
-static void nr_config(struct rkispp_params_vdev *params_vdev,
-		      struct rkispp_nr_config *arg)
-{
-	u32 i, val;
-	u8 big_en, nobig_en, sd32_self_en = 0;
-
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_GAIN_1SIGMA,
-		arg->uvnr_gain_1sigma);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_GAIN_OFFSET,
-		arg->uvnr_gain_offset);
-	val = ISPP_PACK_4BYTE(arg->uvnr_gain_uvgain[0],
-		arg->uvnr_gain_uvgain[1], arg->uvnr_gain_t2gen,
-		arg->uvnr_gain_iso);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_GAIN_GBLGAIN, val);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T1GEN_M3ALPHA,
-		arg->uvnr_t1gen_m3alpha);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T1FLT_MODE,
-		arg->uvnr_t1flt_mode);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T1FLT_MSIGMA,
-		arg->uvnr_t1flt_msigma);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T1FLT_WTP,
-		arg->uvnr_t1flt_wtp);
-	for (i = 0; i < NR_UVNR_T1FLT_WTQ_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->uvnr_t1flt_wtq[i],
-			arg->uvnr_t1flt_wtq[i + 1], arg->uvnr_t1flt_wtq[i + 2],
-			arg->uvnr_t1flt_wtq[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T1FLT_WTQ0 + i, val);
-	}
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T2GEN_M3ALPHA,
-		arg->uvnr_t2gen_m3alpha);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T2GEN_MSIGMA,
-		arg->uvnr_t2gen_msigma);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T2GEN_WTP,
-		arg->uvnr_t2gen_wtp);
-	val = ISPP_PACK_4BYTE(arg->uvnr_t2gen_wtq[0],
-		arg->uvnr_t2gen_wtq[1], arg->uvnr_t2gen_wtq[2],
-		arg->uvnr_t2gen_wtq[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T2GEN_WTQ, val);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T2FLT_MSIGMA,
-		arg->uvnr_t2flt_msigma);
-	val = ISPP_PACK_4BYTE(arg->uvnr_t2flt_wtp,
-		arg->uvnr_t2flt_wt[0], arg->uvnr_t2flt_wt[1],
-		arg->uvnr_t2flt_wt[2]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_UVNR_T2FLT_WT, val);
-
-	val = ISPP_PACK_4BIT(arg->ynr_sgm_dx[0], arg->ynr_sgm_dx[1],
-		arg->ynr_sgm_dx[2], arg->ynr_sgm_dx[3],
-		arg->ynr_sgm_dx[4], arg->ynr_sgm_dx[5],
-		arg->ynr_sgm_dx[6], arg->ynr_sgm_dx[7]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_SGM_DX_1_8, val);
-	val = ISPP_PACK_4BIT(arg->ynr_sgm_dx[8], arg->ynr_sgm_dx[9],
-		arg->ynr_sgm_dx[10], arg->ynr_sgm_dx[11],
-		arg->ynr_sgm_dx[12], arg->ynr_sgm_dx[13],
-		arg->ynr_sgm_dx[14], arg->ynr_sgm_dx[15]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_SGM_DX_9_16, val);
-
-	for (i = 0; i < NR_YNR_SGM_Y_SIZE - 1; i += 2) {
-		rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LSGM_Y_0_1 + i * 2,
-			ISPP_PACK_2SHORT(arg->ynr_lsgm_y[i], arg->ynr_lsgm_y[i + 1]));
-
-		rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HSGM_Y_0_1 + i * 2,
-			ISPP_PACK_2SHORT(arg->ynr_hsgm_y[i], arg->ynr_hsgm_y[i + 1]));
-	}
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LSGM_Y_16, arg->ynr_lsgm_y[16]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HSGM_Y_16, arg->ynr_hsgm_y[16]);
-
-	val = ISPP_PACK_4BYTE(arg->ynr_lci[0], arg->ynr_lci[1],
-		arg->ynr_lci[2], arg->ynr_lci[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LCI, val);
-	val = ISPP_PACK_4BYTE(arg->ynr_lgain_min[0], arg->ynr_lgain_min[1],
-		arg->ynr_lgain_min[2], arg->ynr_lgain_min[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LGAIN_DIRE_MIN, val);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_IGAIN_DIRE_MAX, arg->ynr_lgain_max);
-	val = ISPP_PACK_4BYTE(arg->ynr_lmerge_bound, arg->ynr_lmerge_ratio, 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LMERGE, val);
-	val = ISPP_PACK_4BYTE(arg->ynr_lweit_flt[0], arg->ynr_lweit_flt[1],
-		arg->ynr_lweit_flt[2], arg->ynr_lweit_flt[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LWEIT_FLT, val);
-	val = ISPP_PACK_4BYTE(arg->ynr_hlci[0], arg->ynr_hlci[1],
-		arg->ynr_hlci[2], arg->ynr_hlci[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HLCI, val);
-	val = ISPP_PACK_4BYTE(arg->ynr_lhci[0], arg->ynr_lhci[1],
-		arg->ynr_lhci[2], arg->ynr_lhci[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LHCI, val);
-	val = ISPP_PACK_4BYTE(arg->ynr_hhci[0], arg->ynr_hhci[1],
-		arg->ynr_hhci[2], arg->ynr_hhci[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HHCI, val);
-	val = ISPP_PACK_4BYTE(arg->ynr_hgain_sgm[0], arg->ynr_hgain_sgm[1],
-		arg->ynr_hgain_sgm[2], arg->ynr_hgain_sgm[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HGAIN_SGM, val);
-
-	for (i = 0; i < NR_YNR_HWEIT_D_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->ynr_hweit_d[i], arg->ynr_hweit_d[i + 1],
-			arg->ynr_hweit_d[i + 2], arg->ynr_hweit_d[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HWEIT_D0 + i, val);
-	}
-
-	for (i = 0; i < NR_YNR_HGRAD_Y_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->ynr_hgrad_y[i], arg->ynr_hgrad_y[i + 1],
-			arg->ynr_hgrad_y[i + 2], arg->ynr_hgrad_y[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HGRAD_Y0 + i, val);
-	}
-
-	val = ISPP_PACK_2SHORT(arg->ynr_hweit[0], arg->ynr_hweit[1]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HWEIT_1_2, val);
-	val = ISPP_PACK_2SHORT(arg->ynr_hweit[2], arg->ynr_hweit[3]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HWEIT_3_4, val);
-
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HMAX_ADJUST, arg->ynr_hmax_adjust);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HSTRENGTH, arg->ynr_hstrength);
-
-	val = ISPP_PACK_4BYTE(arg->ynr_lweit_cmp[0], arg->ynr_lweit_cmp[1], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LWEIT_CMP, val);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_LMAXGAIN_LV4, arg->ynr_lmaxgain_lv4);
-
-	for (i = 0; i < NR_YNR_HSTV_Y_SIZE - 1; i += 2) {
-		val = ISPP_PACK_2SHORT(arg->ynr_hstv_y[i], arg->ynr_hstv_y[i + 1]);
-		rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HSTV_Y_0_1 + i * 2, val);
-	}
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_HSTV_Y_16, arg->ynr_hstv_y[16]);
-
-	val = ISPP_PACK_2SHORT(arg->ynr_st_scale[0], arg->ynr_st_scale[1]);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_ST_SCALE_LV1_LV2, val);
-	rkispp_write(params_vdev->dev, RKISPP_NR_YNR_ST_SCALE_LV3, arg->ynr_st_scale[2]);
-
-	big_en = arg->uvnr_big_en & 0x01;
-	nobig_en = arg->uvnr_nobig_en & 0x01;
-	if (get_input_size(params_vdev) > ISPP_NOBIG_OVERFLOW_SIZE) {
-		big_en = 1;
-		nobig_en = 0;
-	}
-
-	if (params_vdev->dev->hw_dev->dev_num == 1)
-		sd32_self_en = arg->uvnr_sd32_self_en;
-	val = arg->uvnr_step1_en << 1 | arg->uvnr_step2_en << 2 |
-	      arg->nr_gain_en << 3 | sd32_self_en << 4 |
-	      nobig_en << 5 | big_en << 6;
-	rkispp_set_bits(params_vdev->dev, RKISPP_NR_UVNR_CTRL_PARA,
-			SW_UVNR_STEP1_ON | SW_UVNR_STEP2_ON |
-			SW_NR_GAIN_BYPASS | SW_UVNR_NOBIG_EN |
-			SW_UVNR_BIG_EN, val);
-}
-
-static void nr_enable(struct rkispp_params_vdev *params_vdev, bool en,
-		      struct rkispp_nr_config *arg)
-{
-	u8 big_en, nobig_en;
-	u32 val;
-
-	big_en = arg->uvnr_big_en & 0x01;
-	nobig_en = arg->uvnr_nobig_en & 0x01;
-	if (get_input_size(params_vdev) > ISPP_NOBIG_OVERFLOW_SIZE) {
-		big_en = 1;
-		nobig_en = 0;
-	}
-
-	val = arg->uvnr_step1_en << 1 | arg->uvnr_step2_en << 2 |
-	      arg->nr_gain_en << 3 | nobig_en << 5 | big_en << 6;
-
-	if (en)
-		val |= SW_NR_EN;
-
-	rkispp_set_bits(params_vdev->dev, RKISPP_NR_UVNR_CTRL_PARA,
-			SW_UVNR_STEP1_ON | SW_UVNR_STEP2_ON |
-			SW_NR_GAIN_BYPASS | SW_UVNR_NOBIG_EN |
-			SW_UVNR_BIG_EN | SW_NR_EN, val);
-}
-
-static void shp_config(struct rkispp_params_vdev *params_vdev,
-		       struct rkispp_sharp_config *arg)
-{
-	u32 i, val;
-
-	rkispp_set_bits(params_vdev->dev, RKISPP_SHARP_CTRL,
-			SW_SHP_WR_ROT_MODE(3),
-			SW_SHP_WR_ROT_MODE(arg->rotation));
-
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_SC_DOWN,
-		(arg->scl_down_v & 0x1) << 1 | (arg->scl_down_h & 0x1));
-
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_TILE_IDX,
-		(arg->tile_ycnt & 0x1F) << 8 | (arg->tile_xcnt & 0xFF));
-
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_HBF_FACTOR, arg->hbf_ratio |
-		arg->ehf_th << 16 | arg->pbf_ratio << 24);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_TH, arg->edge_thed |
-		arg->dir_min << 8 | arg->smoth_th4 << 16);
-	val = ISPP_PACK_2SHORT(arg->l_alpha, arg->g_alpha);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_ALPHA, val);
-	val = ISPP_PACK_4BYTE(arg->pbf_k[0], arg->pbf_k[1], arg->pbf_k[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_PBF_KERNEL, val);
-	val = ISPP_PACK_4BYTE(arg->mrf_k[0], arg->mrf_k[1], arg->mrf_k[2], arg->mrf_k[3]);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_MRF_KERNEL0, val);
-	val = ISPP_PACK_4BYTE(arg->mrf_k[4], arg->mrf_k[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_MRF_KERNEL1, val);
-
-	for (i = 0; i < SHP_MBF_KERNEL_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->mbf_k[i], arg->mbf_k[i + 1],
-			arg->mbf_k[i + 2], arg->mbf_k[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_MBF_KERNEL0 + i, val);
-	}
-
-	val = ISPP_PACK_4BYTE(arg->hrf_k[0], arg->hrf_k[1], arg->hrf_k[2], arg->hrf_k[3]);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_HRF_KERNEL0, val);
-	val = ISPP_PACK_4BYTE(arg->hrf_k[4], arg->hrf_k[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_HRF_KERNEL1, val);
-	val = ISPP_PACK_4BYTE(arg->hbf_k[0], arg->hbf_k[1], arg->hbf_k[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_HBF_KERNEL, val);
-
-	val = ISPP_PACK_4BYTE(arg->eg_coef[0], arg->eg_coef[1], arg->eg_coef[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_COEF, val);
-	val = ISPP_PACK_4BYTE(arg->eg_smoth[0], arg->eg_smoth[1], arg->eg_smoth[2], 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_SMOTH, val);
-	val = ISPP_PACK_4BYTE(arg->eg_gaus[0], arg->eg_gaus[1], arg->eg_gaus[2], arg->eg_gaus[3]);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_GAUS0, val);
-	val = ISPP_PACK_4BYTE(arg->eg_gaus[4], arg->eg_gaus[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_GAUS1, val);
-
-	val = ISPP_PACK_4BYTE(arg->dog_k[0], arg->dog_k[1], arg->dog_k[2], arg->dog_k[3]);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_DOG_KERNEL0, val);
-	val = ISPP_PACK_4BYTE(arg->dog_k[4], arg->dog_k[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_DOG_KERNEL1, val);
-	val = ISPP_PACK_4BYTE(arg->lum_point[0], arg->lum_point[1],
-		arg->lum_point[2], arg->lum_point[3]);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_LUM_POINT0, val);
-	val = ISPP_PACK_4BYTE(arg->lum_point[4], arg->lum_point[5], 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_LUM_POINT1, val);
-
-	val = ISPP_PACK_4BYTE(arg->pbf_shf_bits, arg->mbf_shf_bits, arg->hbf_shf_bits, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_SHF_BITS, val);
-
-	for (i = 0; i < SHP_SIGMA_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->pbf_sigma[i], arg->pbf_sigma[i + 1],
-			arg->pbf_sigma[i + 2], arg->pbf_sigma[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_PBF_SIGMA_INV0 + i, val);
-		val = ISPP_PACK_4BYTE(arg->mbf_sigma[i], arg->mbf_sigma[i + 1],
-			arg->mbf_sigma[i + 2], arg->mbf_sigma[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_MBF_SIGMA_INV0 + i, val);
-		val = ISPP_PACK_4BYTE(arg->hbf_sigma[i], arg->hbf_sigma[i + 1],
-			arg->hbf_sigma[i + 2], arg->hbf_sigma[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_HBF_SIGMA_INV0 + i, val);
-	}
-
-	for (i = 0; i < SHP_LUM_CLP_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->lum_clp_m[i], arg->lum_clp_m[i + 1],
-			arg->lum_clp_m[i + 2], arg->lum_clp_m[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_LUM_CLP_M0 + i, val);
-		val = ISPP_PACK_4BYTE(arg->lum_clp_h[i], arg->lum_clp_h[i + 1],
-			arg->lum_clp_h[i + 2], arg->lum_clp_h[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_LUM_CLP_H0 + i, val);
-	}
-
-	for (i = 0; i < SHP_LUM_MIN_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->lum_min_m[i], arg->lum_min_m[i + 1],
-			arg->lum_min_m[i + 2], arg->lum_min_m[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_LUM_MIN_M0 + i, val);
-	}
-
-	for (i = 0; i < SHP_EDGE_LUM_THED_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->edge_lum_thed[i], arg->edge_lum_thed[i + 1],
-			arg->edge_lum_thed[i + 2], arg->edge_lum_thed[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_EDGE_LUM_THED0 + i, val);
-	}
-
-	for (i = 0; i < SHP_CLAMP_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->clamp_pos[i], arg->clamp_pos[i + 1],
-			arg->clamp_pos[i + 2], arg->clamp_pos[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_CLAMP_POS_DOG0 + i, val);
-		val = ISPP_PACK_4BYTE(arg->clamp_neg[i], arg->clamp_neg[i + 1],
-			arg->clamp_neg[i + 2], arg->clamp_neg[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_CLAMP_NEG_DOG0 + i, val);
-	}
-
-	for (i = 0; i < SHP_DETAIL_ALPHA_SIZE; i += 4) {
-		val = ISPP_PACK_4BYTE(arg->detail_alpha[i], arg->detail_alpha[i + 1],
-			arg->detail_alpha[i + 2], arg->detail_alpha[i + 3]);
-		rkispp_write(params_vdev->dev, RKISPP_SHARP_DETAIL_ALPHA_DOG0 + i, val);
-	}
-
-	val = ISPP_PACK_2SHORT(arg->rfl_ratio, arg->rfh_ratio);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_RF_RATIO, val);
-
-	val = ISPP_PACK_4BYTE(arg->m_ratio, arg->h_ratio, 0, 0);
-	rkispp_write(params_vdev->dev, RKISPP_SHARP_GRAD_RATIO, val);
-
-	val = arg->alpha_adp_en << 1 | arg->yin_flt_en << 3 |
-	      arg->edge_avg_en << 4;
-	rkispp_set_bits(params_vdev->dev, RKISPP_SHARP_CORE_CTRL,
-			SW_SHP_ALPHA_ADP_EN | SW_SHP_YIN_FLT_EN |
-			SW_SHP_EDGE_AVG_EN, val);
-}
-
-static void shp_enable(struct rkispp_params_vdev *params_vdev, bool en,
-		       struct rkispp_sharp_config *arg)
-{
-	u32 ens = params_vdev->dev->stream_vdev.module_ens;
-	u32 val;
-
-	if (en && !(ens & ISPP_MODULE_FEC)) {
-		rkispp_set_bits(params_vdev->dev, RKISPP_SCL0_CTRL,
-				SW_SCL_FIRST_MODE, SW_SCL_FIRST_MODE);
-		rkispp_set_bits(params_vdev->dev, RKISPP_SCL1_CTRL,
-				SW_SCL_FIRST_MODE, SW_SCL_FIRST_MODE);
-		rkispp_set_bits(params_vdev->dev, RKISPP_SCL2_CTRL,
-				SW_SCL_FIRST_MODE, SW_SCL_FIRST_MODE);
-	} else {
-		rkispp_clear_bits(params_vdev->dev, RKISPP_SCL0_CTRL, SW_SCL_FIRST_MODE);
-		rkispp_clear_bits(params_vdev->dev, RKISPP_SCL1_CTRL, SW_SCL_FIRST_MODE);
-		rkispp_clear_bits(params_vdev->dev, RKISPP_SCL2_CTRL, SW_SCL_FIRST_MODE);
-	}
-
-	val = arg->alpha_adp_en << 1 | arg->yin_flt_en << 3 |
-	      arg->edge_avg_en << 4;
-	if (en)
-		val |= SW_SHP_EN;
-	rkispp_set_bits(params_vdev->dev, RKISPP_SHARP_CORE_CTRL,
-			SW_SHP_ALPHA_ADP_EN | SW_SHP_YIN_FLT_EN |
-			SW_SHP_EDGE_AVG_EN | SW_SHP_EN, val);
-}
-
-static void fec_config(struct rkispp_params_vdev *params_vdev,
-		       struct rkispp_fec_config *arg)
-{
-	struct rkispp_device *dev = params_vdev->dev;
-	struct rkispp_fec_head *fec_data;
-	u32 width, height, mesh_size;
-	dma_addr_t dma_addr;
-	u32 val, i, buf_idx;
-
-	width = dev->ispp_sdev.out_fmt.width;
-	height = dev->ispp_sdev.out_fmt.height;
-	mesh_size = cal_fec_mesh(width, height, 0);
-	if (arg->mesh_size > mesh_size) {
-		v4l2_err(&dev->v4l2_dev,
-			 "Input mesh size too large. mesh size 0x%x, 0x%x\n",
-			 arg->mesh_size, mesh_size);
-		return;
-	}
-
-	for (i = 0; i < params_vdev->buf_cnt; i++) {
-		if (arg->buf_fd == params_vdev->buf_fec[i].dma_fd)
-			break;
-	}
-	if (i == params_vdev->buf_cnt) {
-		dev_err(dev->dev, "cannot find fec buf fd(%d)\n", arg->buf_fd);
-		return;
-	}
-
-	if (!params_vdev->buf_fec[i].vaddr) {
-		dev_err(dev->dev, "no fec buffer allocated\n");
-		return;
-	}
-
-	buf_idx = params_vdev->buf_fec_idx;
-	fec_data = (struct rkispp_fec_head *)params_vdev->buf_fec[buf_idx].vaddr;
-	fec_data->stat = FEC_BUF_INIT;
-
-	buf_idx = i;
-	fec_data = (struct rkispp_fec_head *)params_vdev->buf_fec[buf_idx].vaddr;
-	fec_data->stat = FEC_BUF_CHIPINUSE;
-	params_vdev->buf_fec_idx = buf_idx;
-
-	rkispp_prepare_buffer(dev, &params_vdev->buf_fec[buf_idx]);
-
-	dma_addr = params_vdev->buf_fec[buf_idx].dma_addr;
-	val = dma_addr + fec_data->meshxf_oft;
-	rkispp_write(params_vdev->dev, RKISPP_FEC_MESH_XFRA_BASE, val);
-	val = dma_addr + fec_data->meshyf_oft;
-	rkispp_write(params_vdev->dev, RKISPP_FEC_MESH_YFRA_BASE, val);
-	val = dma_addr + fec_data->meshxi_oft;
-	rkispp_write(params_vdev->dev, RKISPP_FEC_MESH_XINT_BASE, val);
-	val = dma_addr + fec_data->meshyi_oft;
-	rkispp_write(params_vdev->dev, RKISPP_FEC_MESH_YINT_BASE, val);
-
-	val = 0;
-	if (arg->mesh_density)
-		val = SW_MESH_DENSITY;
-	rkispp_set_bits(params_vdev->dev, RKISPP_FEC_CORE_CTRL, SW_MESH_DENSITY, val);
-
-	rkispp_write(params_vdev->dev, RKISPP_FEC_MESH_SIZE, arg->mesh_size);
-
-	val = (arg->crop_height & 0x1FFFF) << 14 |
-	      (arg->crop_width & 0x1FFFF) << 1 | (arg->crop_en & 0x01);
-	rkispp_write(params_vdev->dev, RKISPP_FEC_CROP, val);
-}
-
-static void fec_enable(struct rkispp_params_vdev *params_vdev, bool en)
-{
-	struct rkispp_device *dev = params_vdev->dev;
-	u32 buf_idx;
-
-	if (en) {
-		buf_idx = params_vdev->buf_fec_idx;
-		if (!params_vdev->buf_fec[buf_idx].vaddr) {
-			dev_err(dev->dev, "no fec buffer allocated\n");
-			return;
-		}
-		rkispp_clear_bits(params_vdev->dev, RKISPP_SCL0_CTRL, SW_SCL_FIRST_MODE);
-		rkispp_clear_bits(params_vdev->dev, RKISPP_SCL1_CTRL, SW_SCL_FIRST_MODE);
-		rkispp_clear_bits(params_vdev->dev, RKISPP_SCL2_CTRL, SW_SCL_FIRST_MODE);
-	}
-	rkispp_set_bits(params_vdev->dev, RKISPP_FEC_CORE_CTRL, SW_FEC_EN, en);
-}
-
-static void orb_config(struct rkispp_params_vdev *params_vdev,
-		       struct rkispp_orb_config *arg)
-{
-	rkispp_write(params_vdev->dev, RKISPP_ORB_LIMIT_VALUE, arg->limit_value & 0xFF);
-	rkispp_write(params_vdev->dev, RKISPP_ORB_MAX_FEATURE, arg->max_feature & 0x1FFFFF);
-}
-
-static void orb_enable(struct rkispp_params_vdev *params_vdev, bool en)
-{
-	rkispp_set_bits(params_vdev->dev, RKISPP_ORB_CORE_CTRL, SW_ORB_EN, en);
-}
 
 static int rkispp_params_enum_fmt_meta_out(struct file *file, void *priv,
 					   struct v4l2_fmtdesc *f)
@@ -705,18 +116,18 @@
 	u32 width, height, mesh_size, buf_size;
 	int i, ret;
 
+	width = fecsize->meas_width;
+	height = fecsize->meas_height;
+	mesh_size = cal_fec_mesh(width, height, fecsize->meas_mode);
+	buf_size = ALIGN(sizeof(struct rkispp_fec_head), 16);
+	buf_size += 2 * (ALIGN(mesh_size * 2, 16) + ALIGN(mesh_size, 16));
+
 	if (fecsize->buf_cnt > FEC_MESH_BUF_MAX)
 		params->buf_cnt = FEC_MESH_BUF_MAX;
 	else if (fecsize->buf_cnt > 0)
 		params->buf_cnt = fecsize->buf_cnt;
 	else
 		params->buf_cnt = FEC_MESH_BUF_NUM;
-
-	width = fecsize->meas_width;
-	height = fecsize->meas_height;
-	mesh_size = cal_fec_mesh(width, height, fecsize->meas_mode);
-	buf_size = ALIGN(sizeof(struct rkispp_fec_head), 16);
-	buf_size += 2 * (ALIGN(mesh_size * 2, 16) + ALIGN(mesh_size, 16));
 
 	params->buf_fec_idx = 0;
 	for (i = 0; i < params->buf_cnt; i++) {
@@ -750,10 +161,10 @@
 			rkispp_write(pp_dev, RKISPP_FEC_MESH_YINT_BASE, val);
 		}
 		v4l2_dbg(1, rkispp_debug, &pp_dev->v4l2_dev,
-			 "%s idx:%d fd:%d dma:0x%x offset xf:0x%x yf:0x%x xi:0x%x yi:0x%x\n",
-			 __func__, i, params->buf_fec[i].dma_fd, params->buf_fec[i].dma_addr,
-			fec_data->meshxf_oft, fec_data->meshyf_oft,
-			fec_data->meshxi_oft, fec_data->meshyi_oft);
+			 "%s idx:%d fd:%d dma:%pad offset xf:0x%x yf:0x%x xi:0x%x yi:0x%x\n",
+			 __func__, i, params->buf_fec[i].dma_fd, &params->buf_fec[i].dma_addr,
+			 fec_data->meshxf_oft, fec_data->meshyf_oft,
+			 fec_data->meshxi_oft, fec_data->meshyi_oft);
 	}
 
 	return 0;
@@ -776,23 +187,28 @@
 					 struct device *alloc_ctxs[])
 {
 	struct rkispp_params_vdev *params_vdev = vq->drv_priv;
+	struct rkispp_device *dev = params_vdev->dev;
 
 	*num_buffers = clamp_t(u32, *num_buffers,
 			       RKISP1_ISP_PARAMS_REQ_BUFS_MIN,
 			       RKISP1_ISP_PARAMS_REQ_BUFS_MAX);
 
 	*num_planes = 1;
-	switch (params_vdev->vdev_id) {
-	case PARAM_VDEV_TNR:
-		sizes[0] = sizeof(struct rkispp_params_tnrcfg);
-		break;
-	case PARAM_VDEV_NR:
-		sizes[0] = sizeof(struct rkispp_params_nrcfg);
-		break;
-	case PARAM_VDEV_FEC:
-	default:
-		sizes[0] = sizeof(struct rkispp_params_feccfg);
-		break;
+	if (dev->ispp_ver == ISPP_V10) {
+		switch (params_vdev->vdev_id) {
+		case PARAM_VDEV_TNR:
+			sizes[0] = sizeof(struct rkispp_params_tnrcfg);
+			break;
+		case PARAM_VDEV_NR:
+			sizes[0] = sizeof(struct rkispp_params_nrcfg);
+			break;
+		case PARAM_VDEV_FEC:
+		default:
+			sizes[0] = sizeof(struct rkispp_params_feccfg);
+			break;
+		}
+	} else if (dev->ispp_ver == ISPP_V20) {
+		sizes[0] = sizeof(struct fec_params_cfg);
 	}
 
 	INIT_LIST_HEAD(&params_vdev->params);
@@ -803,50 +219,10 @@
 
 static void rkispp_params_vb2_buf_queue(struct vb2_buffer *vb)
 {
-	struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
-	struct rkispp_buffer *params_buf = to_rkispp_buffer(vbuf);
 	struct vb2_queue *vq = vb->vb2_queue;
 	struct rkispp_params_vdev *params_vdev = vq->drv_priv;
-	struct rkispp_device *dev = params_vdev->dev;
-	struct rkispp_stream_vdev *vdev = &dev->stream_vdev;
-	unsigned long flags;
 
-	spin_lock_irqsave(&params_vdev->config_lock, flags);
-	if (params_vdev->first_params) {
-		params_vdev->first_params = false;
-		if (params_vdev->vdev_id == PARAM_VDEV_NR)
-			wake_up(&params_vdev->dev->sync_onoff);
-	}
-	spin_unlock_irqrestore(&params_vdev->config_lock, flags);
-
-	params_buf->vaddr[0] = vb2_plane_vaddr(vb, 0);
-	spin_lock_irqsave(&params_vdev->config_lock, flags);
-	list_add_tail(&params_buf->queue, &params_vdev->params);
-	spin_unlock_irqrestore(&params_vdev->config_lock, flags);
-
-	if (params_vdev->vdev_id == PARAM_VDEV_NR) {
-		struct rkisp_ispp_buf *buf_rd = NULL;
-
-		spin_lock_irqsave(&vdev->tnr.buf_lock, flags);
-		if (!list_empty(&vdev->tnr.list_rpt)) {
-			buf_rd = list_first_entry(&vdev->tnr.list_rpt,
-					struct rkisp_ispp_buf, list);
-			list_del(&buf_rd->list);
-		}
-		spin_unlock_irqrestore(&vdev->tnr.buf_lock, flags);
-		rkispp_module_work_event(dev, buf_rd, NULL, ISPP_MODULE_NR, false);
-	} else if (params_vdev->vdev_id == PARAM_VDEV_FEC) {
-		struct rkispp_dummy_buffer *buf_rd = NULL;
-
-		spin_lock_irqsave(&vdev->nr.buf_lock, flags);
-		if (!list_empty(&vdev->nr.list_rpt)) {
-			buf_rd = list_first_entry(&vdev->nr.list_rpt,
-					struct rkispp_dummy_buffer, list);
-			list_del(&buf_rd->list);
-			list_add_tail(&buf_rd->list, &vdev->fec.list_rd);
-		}
-		spin_unlock_irqrestore(&vdev->nr.buf_lock, flags);
-	}
+	params_vdev->params_ops->rkispp_params_vb2_buf_queue(vb);
 }
 
 static void rkispp_params_vb2_stop_streaming(struct vb2_queue *vq)
@@ -910,7 +286,7 @@
 
 	ret = v4l2_fh_open(filp);
 	if (!ret) {
-		ret = v4l2_pipeline_pm_use(&params->vnode.vdev.entity, 1);
+		ret = v4l2_pipeline_pm_get(&params->vnode.vdev.entity);
 		if (ret < 0) {
 			v4l2_err(&isppdev->v4l2_dev,
 				 "pipeline power on failed %d\n", ret);
@@ -930,19 +306,14 @@
 {
 	struct rkispp_params_vdev *params = video_drvdata(filp);
 	struct video_device *vdev = video_devdata(filp);
-	struct rkispp_device *isppdev = params->dev;
 	int ret;
 
 	if (filp->private_data == vdev->queue->owner)
 		rkispp_param_deinit_fecbuf(params);
 
 	ret = vb2_fop_release(filp);
-	if (!ret) {
-		ret = v4l2_pipeline_pm_use(&params->vnode.vdev.entity, 0);
-		if (ret < 0)
-			v4l2_err(&isppdev->v4l2_dev,
-				 "pipeline power off failed %d\n", ret);
-	}
+	if (!ret)
+		v4l2_pipeline_pm_put(&params->vnode.vdev.entity);
 	return ret;
 }
 
@@ -953,7 +324,6 @@
 	.buf_queue = rkispp_params_vb2_buf_queue,
 	.start_streaming = rkispp_params_vb2_start_streaming,
 	.stop_streaming = rkispp_params_vb2_stop_streaming,
-
 };
 
 struct v4l2_file_operations rkispp_params_fops = {
@@ -979,128 +349,6 @@
 	q->dev = params_vdev->dev->hw_dev->dev;
 
 	return vb2_queue_init(q);
-}
-
-static void fec_data_abandon(struct rkispp_params_vdev *vdev,
-			     struct rkispp_params_feccfg *params)
-{
-	struct rkispp_fec_head *data;
-	int i;
-
-	for (i = 0; i < vdev->buf_cnt; i++) {
-		if (params->fec_cfg.buf_fd == vdev->buf_fec[i].dma_fd) {
-			data = (struct rkispp_fec_head *)vdev->buf_fec[i].vaddr;
-			if (data)
-				data->stat = FEC_BUF_INIT;
-			break;
-		}
-	}
-}
-
-void rkispp_params_cfg(struct rkispp_params_vdev *params_vdev, u32 frame_id)
-{
-	struct rkispp_params_cfghead *param_head = NULL;
-	u32 module_en_update, module_cfg_update, module_ens;
-
-	spin_lock(&params_vdev->config_lock);
-	if (!params_vdev->streamon) {
-		spin_unlock(&params_vdev->config_lock);
-		return;
-	}
-
-	/* get buffer by frame_id */
-	while (!list_empty(&params_vdev->params) && !params_vdev->cur_buf) {
-		params_vdev->cur_buf = list_first_entry(&params_vdev->params,
-				struct rkispp_buffer, queue);
-
-		param_head = (struct rkispp_params_cfghead *)(params_vdev->cur_buf->vaddr[0]);
-		if (param_head->frame_id < frame_id) {
-			list_del(&params_vdev->cur_buf->queue);
-			/* force to on/off module */
-			if (param_head->module_en_update)
-				break;
-			if (param_head->module_cfg_update & ISPP_MODULE_FEC)
-				fec_data_abandon(params_vdev, (struct rkispp_params_feccfg *)param_head);
-			vb2_buffer_done(&params_vdev->cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
-			params_vdev->cur_buf = NULL;
-			continue;
-		} else if (param_head->frame_id == frame_id) {
-			list_del(&params_vdev->cur_buf->queue);
-		} else {
-			params_vdev->cur_buf = NULL;
-		}
-		break;
-	}
-
-	if (!params_vdev->cur_buf) {
-		spin_unlock(&params_vdev->config_lock);
-		return;
-	}
-
-	param_head = (struct rkispp_params_cfghead *)(params_vdev->cur_buf->vaddr[0]);
-
-	module_en_update = param_head->module_en_update;
-	module_cfg_update = param_head->module_cfg_update;
-	module_ens = param_head->module_ens;
-	if (params_vdev->dev->hw_dev->is_fec_ext) {
-		module_en_update &= ~ISPP_MODULE_FEC;
-		module_cfg_update &= ~ISPP_MODULE_FEC;
-		module_ens &= ~ISPP_MODULE_FEC;
-	}
-
-	if (params_vdev->vdev_id == PARAM_VDEV_TNR) {
-		struct rkispp_params_tnrcfg *tnr_params;
-
-		tnr_params = (struct rkispp_params_tnrcfg *)param_head;
-		if (module_cfg_update & ISPP_MODULE_TNR)
-			tnr_config(params_vdev,
-				   &tnr_params->tnr_cfg);
-		if (module_en_update & ISPP_MODULE_TNR)
-			tnr_enable(params_vdev,
-				   !!(module_ens & ISPP_MODULE_TNR));
-	} else if (params_vdev->vdev_id == PARAM_VDEV_NR) {
-		struct rkispp_params_nrcfg *nr_params;
-
-		nr_params = (struct rkispp_params_nrcfg *)param_head;
-		if (module_cfg_update & ISPP_MODULE_NR)
-			nr_config(params_vdev,
-				  &nr_params->nr_cfg);
-		if (module_en_update & ISPP_MODULE_NR)
-			nr_enable(params_vdev,
-				  !!(module_ens & ISPP_MODULE_NR),
-				  &nr_params->nr_cfg);
-
-		if (module_cfg_update & ISPP_MODULE_SHP)
-			shp_config(params_vdev,
-				   &nr_params->shp_cfg);
-		if (module_en_update & ISPP_MODULE_SHP)
-			shp_enable(params_vdev,
-				   !!(module_ens & ISPP_MODULE_SHP),
-				   &nr_params->shp_cfg);
-
-		if (module_cfg_update & ISPP_MODULE_ORB)
-			orb_config(params_vdev,
-				   &nr_params->orb_cfg);
-		if (module_en_update & ISPP_MODULE_ORB)
-			orb_enable(params_vdev,
-				   !!(module_ens & ISPP_MODULE_ORB));
-	} else {
-		struct rkispp_params_feccfg *fec_params;
-
-		fec_params = (struct rkispp_params_feccfg *)param_head;
-		if (module_cfg_update & ISPP_MODULE_FEC)
-			fec_config(params_vdev,
-				   &fec_params->fec_cfg);
-		if (module_en_update & ISPP_MODULE_FEC)
-			fec_enable(params_vdev,
-				   !!(module_ens & ISPP_MODULE_FEC));
-	}
-
-	vb2_buffer_done(&params_vdev->cur_buf->vb.vb2_buf,
-				VB2_BUF_STATE_DONE);
-	params_vdev->cur_buf = NULL;
-
-	spin_unlock(&params_vdev->config_lock);
 }
 
 void rkispp_params_get_fecbuf_inf(struct rkispp_params_vdev *params_vdev,
@@ -1144,6 +392,10 @@
 	params_vdev->is_subs_evt = false;
 	params_vdev->vdev_id = vdev_id;
 
+	if (dev->ispp_ver == ISPP_V10)
+		rkispp_params_init_ops_v10(params_vdev);
+	if (dev->ispp_ver == ISPP_V20)
+		rkispp_params_init_ops_v20(params_vdev);
 	spin_lock_init(&params_vdev->config_lock);
 	switch (vdev_id) {
 	case PARAM_VDEV_TNR:
@@ -1180,7 +432,7 @@
 	ret = media_entity_pads_init(&vdev->entity, 1, &node->pad);
 	if (ret < 0)
 		goto err_release_queue;
-	ret = video_register_device(vdev, VFL_TYPE_GRABBER, -1);
+	ret = video_register_device(vdev, VFL_TYPE_VIDEO, -1);
 	if (ret < 0) {
 		dev_err(&vdev->dev,
 			"could not register Video for Linux device\n");
@@ -1212,21 +464,23 @@
 {
 	int ret = 0;
 
-	ret = rkispp_register_params_vdev(dev, PARAM_VDEV_TNR);
+	ret = rkispp_register_params_vdev(dev, PARAM_VDEV_FEC);
 	if (ret)
 		return ret;
 
-	ret = rkispp_register_params_vdev(dev, PARAM_VDEV_NR);
-	if (ret) {
-		rkispp_unregister_params_vdev(dev, PARAM_VDEV_TNR);
-		return ret;
-	}
+	if (dev->ispp_ver == ISPP_V10) {
+		ret = rkispp_register_params_vdev(dev, PARAM_VDEV_TNR);
+		if (ret) {
+			rkispp_unregister_params_vdev(dev, PARAM_VDEV_FEC);
+			return ret;
+		}
 
-	ret = rkispp_register_params_vdev(dev, PARAM_VDEV_FEC);
-	if (ret) {
-		rkispp_unregister_params_vdev(dev, PARAM_VDEV_TNR);
-		rkispp_unregister_params_vdev(dev, PARAM_VDEV_NR);
-		return ret;
+		ret = rkispp_register_params_vdev(dev, PARAM_VDEV_NR);
+		if (ret) {
+			rkispp_unregister_params_vdev(dev, PARAM_VDEV_FEC);
+			rkispp_unregister_params_vdev(dev, PARAM_VDEV_TNR);
+			return ret;
+		}
 	}
 
 	return ret;
@@ -1234,7 +488,9 @@
 
 void rkispp_unregister_params_vdevs(struct rkispp_device *dev)
 {
-	rkispp_unregister_params_vdev(dev, PARAM_VDEV_TNR);
-	rkispp_unregister_params_vdev(dev, PARAM_VDEV_NR);
 	rkispp_unregister_params_vdev(dev, PARAM_VDEV_FEC);
+	if (dev->ispp_ver == ISPP_V10) {
+		rkispp_unregister_params_vdev(dev, PARAM_VDEV_TNR);
+		rkispp_unregister_params_vdev(dev, PARAM_VDEV_NR);
+	}
 }

--
Gitblit v1.6.2