~hc/RK356X_SDK_RELEASE.git

..	..	@@ -47,9 +47,12 @@
47	47
48	48	static inline void
49	49	isp3_param_write(struct rkisp_isp_params_vdev *params_vdev,
50		- u32 value, u32 addr)
	50	+ u32 value, u32 addr, u32 id)
51	51	{
52		- rkisp_write(params_vdev->dev, addr, value, false);
	52	+ if (id == ISP3_LEFT)
	53	+ rkisp_write(params_vdev->dev, addr, value, false);
	54	+ else
	55	+ rkisp_next_write(params_vdev->dev, addr, value, false);
53	56	}
54	57
55	58	static inline u32
..	..	@@ -59,45 +62,63 @@
59	62	}
60	63
61	64	static inline u32
62		-isp3_param_read(struct rkisp_isp_params_vdev *params_vdev, u32 addr)
	65	+isp3_param_read(struct rkisp_isp_params_vdev *params_vdev, u32 addr, u32 id)
63	66	{
64		- return rkisp_read(params_vdev->dev, addr, false);
	67	+ u32 val;
	68	+
	69	+ if (id == ISP3_LEFT)
	70	+ val = rkisp_read(params_vdev->dev, addr, false);
	71	+ else
	72	+ val = rkisp_next_read(params_vdev->dev, addr, false);
	73	+ return val;
65	74	}
66	75
67	76	static inline u32
68		-isp3_param_read_cache(struct rkisp_isp_params_vdev *params_vdev, u32 addr)
	77	+isp3_param_read_cache(struct rkisp_isp_params_vdev *params_vdev, u32 addr, u32 id)
69	78	{
70		- return rkisp_read_reg_cache(params_vdev->dev, addr);
	79	+ u32 val;
	80	+
	81	+ if (id == ISP3_LEFT)
	82	+ val = rkisp_read_reg_cache(params_vdev->dev, addr);
	83	+ else
	84	+ val = rkisp_next_read_reg_cache(params_vdev->dev, addr);
	85	+ return val;
71	86	}
72	87
73	88	static inline void
74	89	isp3_param_set_bits(struct rkisp_isp_params_vdev *params_vdev,
75		- u32 reg, u32 bit_mask)
	90	+ u32 reg, u32 bit_mask, u32 id)
76	91	{
77		- rkisp_set_bits(params_vdev->dev, reg, 0, bit_mask, false);
	92	+ if (id == ISP3_LEFT)
	93	+ rkisp_set_bits(params_vdev->dev, reg, 0, bit_mask, false);
	94	+ else
	95	+ rkisp_next_set_bits(params_vdev->dev, reg, 0, bit_mask, false);
78	96	}
79	97
80	98	static inline void
81	99	isp3_param_clear_bits(struct rkisp_isp_params_vdev *params_vdev,
82		- u32 reg, u32 bit_mask)
	100	+ u32 reg, u32 bit_mask, u32 id)
83	101	{
84		- rkisp_clear_bits(params_vdev->dev, reg, bit_mask, false);
	102	+ if (id == ISP3_LEFT)
	103	+ rkisp_clear_bits(params_vdev->dev, reg, bit_mask, false);
	104	+ else
	105	+ rkisp_next_clear_bits(params_vdev->dev, reg, bit_mask, false);
85	106	}
86	107
87	108	static void
88	109	isp_dpcc_config(struct rkisp_isp_params_vdev *params_vdev,
89		- const struct isp2x_dpcc_cfg *arg)
	110	+ const struct isp2x_dpcc_cfg *arg, u32 id)
90	111	{
91	112	u32 value;
92	113	int i;
93	114
94		- value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE);
	115	+ value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE, id);
95	116	value &= ISP_DPCC_EN;
96	117
97	118	value \|= !!arg->stage1_enable << 2 \|
98	119	!!arg->grayscale_mode << 1;
99		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE);
100		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE);
	120	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE, id);
	121	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE, id);
101	122
102	123	value = (arg->sw_rk_out_sel & 0x03) << 5 \|
103	124	!!arg->sw_dpcc_output_sel << 4 \|
..	..	@@ -105,15 +126,15 @@
105	126	!!arg->stage1_g_3x3 << 2 \|
106	127	!!arg->stage1_incl_rb_center << 1 \|
107	128	!!arg->stage1_incl_green_center;
108		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_OUTPUT_MODE);
109		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_OUTPUT_MODE);
	129	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_OUTPUT_MODE, id);
	130	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_OUTPUT_MODE, id);
110	131
111	132	value = !!arg->stage1_use_fix_set << 3 \|
112	133	!!arg->stage1_use_set_3 << 2 \|
113	134	!!arg->stage1_use_set_2 << 1 \|
114	135	!!arg->stage1_use_set_1;
115		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_SET_USE);
116		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_SET_USE);
	136	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_SET_USE, id);
	137	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_SET_USE, id);
117	138
118	139	value = !!arg->sw_rk_red_blue1_en << 13 \|
119	140	!!arg->rg_red_blue1_enable << 12 \|
..	..	@@ -127,8 +148,8 @@
127	148	!!arg->ro_green1_enable << 2 \|
128	149	!!arg->lc_green1_enable << 1 \|
129	150	!!arg->pg_green1_enable;
130		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_1);
131		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_1);
	151	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_1, id);
	152	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_1, id);
132	153
133	154	value = !!arg->sw_rk_red_blue2_en << 13 \|
134	155	!!arg->rg_red_blue2_enable << 12 \|
..	..	@@ -142,8 +163,8 @@
142	163	!!arg->ro_green2_enable << 2 \|
143	164	!!arg->lc_green2_enable << 1 \|
144	165	!!arg->pg_green2_enable;
145		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_2);
146		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_2);
	166	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_2, id);
	167	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_2, id);
147	168
148	169	value = !!arg->sw_rk_red_blue3_en << 13 \|
149	170	!!arg->rg_red_blue3_enable << 12 \|
..	..	@@ -157,74 +178,74 @@
157	178	!!arg->ro_green3_enable << 2 \|
158	179	!!arg->lc_green3_enable << 1 \|
159	180	!!arg->pg_green3_enable;
160		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_3);
161		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_3);
	181	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_METHODS_SET_3, id);
	182	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_METHODS_SET_3, id);
162	183
163	184	value = ISP_PACK_4BYTE(arg->line_thr_1_g, arg->line_thr_1_rb,
164	185	arg->sw_mindis1_g, arg->sw_mindis1_rb);
165		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_1);
166		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_1);
	186	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_1, id);
	187	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_1, id);
167	188
168	189	value = ISP_PACK_4BYTE(arg->line_mad_fac_1_g, arg->line_mad_fac_1_rb,
169	190	arg->sw_dis_scale_max1, arg->sw_dis_scale_min1);
170		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_1);
171		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_1);
	191	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_1, id);
	192	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_1, id);
172	193
173	194	value = ISP_PACK_4BYTE(arg->pg_fac_1_g, arg->pg_fac_1_rb, 0, 0);
174		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_1);
175		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_1);
	195	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_1, id);
	196	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_1, id);
176	197
177	198	value = ISP_PACK_4BYTE(arg->rnd_thr_1_g, arg->rnd_thr_1_rb, 0, 0);
178		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_1);
179		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_1);
	199	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_1, id);
	200	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_1, id);
180	201
181	202	value = ISP_PACK_4BYTE(arg->rg_fac_1_g, arg->rg_fac_1_rb, 0, 0);
182		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_1);
183		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_1);
	203	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_1, id);
	204	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_1, id);
184	205
185	206	value = ISP_PACK_4BYTE(arg->line_thr_2_g, arg->line_thr_2_rb,
186	207	arg->sw_mindis2_g, arg->sw_mindis2_rb);
187		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_2);
188		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_2);
	208	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_2, id);
	209	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_2, id);
189	210
190	211	value = ISP_PACK_4BYTE(arg->line_mad_fac_2_g, arg->line_mad_fac_2_rb,
191	212	arg->sw_dis_scale_max2, arg->sw_dis_scale_min2);
192		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_2);
193		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_2);
	213	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_2, id);
	214	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_2, id);
194	215
195	216	value = ISP_PACK_4BYTE(arg->pg_fac_2_g, arg->pg_fac_2_rb, 0, 0);
196		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_2);
197		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_2);
	217	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_2, id);
	218	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_2, id);
198	219
199	220	value = ISP_PACK_4BYTE(arg->rnd_thr_2_g, arg->rnd_thr_2_rb, 0, 0);
200		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_2);
201		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_2);
	221	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_2, id);
	222	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_2, id);
202	223
203	224	value = ISP_PACK_4BYTE(arg->rg_fac_2_g, arg->rg_fac_2_rb, 0, 0);
204		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_2);
205		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_2);
	225	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_2, id);
	226	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_2, id);
206	227
207	228	value = ISP_PACK_4BYTE(arg->line_thr_3_g, arg->line_thr_3_rb,
208	229	arg->sw_mindis3_g, arg->sw_mindis3_rb);
209		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_3);
210		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_3);
	230	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_THRESH_3, id);
	231	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_THRESH_3, id);
211	232
212	233	value = ISP_PACK_4BYTE(arg->line_mad_fac_3_g, arg->line_mad_fac_3_rb,
213	234	arg->sw_dis_scale_max3, arg->sw_dis_scale_min3);
214		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_3);
215		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_3);
	235	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_LINE_MAD_FAC_3, id);
	236	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_LINE_MAD_FAC_3, id);
216	237
217	238	value = ISP_PACK_4BYTE(arg->pg_fac_3_g, arg->pg_fac_3_rb, 0, 0);
218		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_3);
219		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_3);
	239	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PG_FAC_3, id);
	240	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PG_FAC_3, id);
220	241
221	242	value = ISP_PACK_4BYTE(arg->rnd_thr_3_g, arg->rnd_thr_3_rb, 0, 0);
222		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_3);
223		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_3);
	243	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_THRESH_3, id);
	244	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_THRESH_3, id);
224	245
225	246	value = ISP_PACK_4BYTE(arg->rg_fac_3_g, arg->rg_fac_3_rb, 0, 0);
226		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_3);
227		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_3);
	247	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RG_FAC_3, id);
	248	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RG_FAC_3, id);
228	249
229	250	value = (arg->ro_lim_3_rb & 0x03) << 10 \|
230	251	(arg->ro_lim_3_g & 0x03) << 8 \|
..	..	@@ -232,8 +253,8 @@
232	253	(arg->ro_lim_2_g & 0x03) << 4 \|
233	254	(arg->ro_lim_1_rb & 0x03) << 2 \|
234	255	(arg->ro_lim_1_g & 0x03);
235		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RO_LIMITS);
236		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RO_LIMITS);
	256	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RO_LIMITS, id);
	257	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RO_LIMITS, id);
237	258
238	259	value = (arg->rnd_offs_3_rb & 0x03) << 10 \|
239	260	(arg->rnd_offs_3_g & 0x03) << 8 \|
..	..	@@ -241,8 +262,8 @@
241	262	(arg->rnd_offs_2_g & 0x03) << 4 \|
242	263	(arg->rnd_offs_1_rb & 0x03) << 2 \|
243	264	(arg->rnd_offs_1_g & 0x03);
244		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_OFFS);
245		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_OFFS);
	265	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_RND_OFFS, id);
	266	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_RND_OFFS, id);
246	267
247	268	value = !!arg->bpt_rb_3x3 << 11 \|
248	269	!!arg->bpt_g_3x3 << 10 \|
..	..	@@ -254,75 +275,75 @@
254	275	!!arg->bpt_use_set_1 << 4 \|
255	276	!!arg->bpt_cor_en << 1 \|
256	277	!!arg->bpt_det_en;
257		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_CTRL);
258		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_CTRL);
	278	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_CTRL, id);
	279	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_CTRL, id);
259	280
260		- isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC0_BPT_NUMBER);
261		- isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC1_BPT_NUMBER);
262		- isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC0_BPT_ADDR);
263		- isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC1_BPT_ADDR);
	281	+ isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC0_BPT_NUMBER, id);
	282	+ isp3_param_write(params_vdev, arg->bp_number, ISP3X_DPCC1_BPT_NUMBER, id);
	283	+ isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC0_BPT_ADDR, id);
	284	+ isp3_param_write(params_vdev, arg->bp_table_addr, ISP3X_DPCC1_BPT_ADDR, id);
264	285
265	286	value = ISP_PACK_2SHORT(arg->bpt_h_addr, arg->bpt_v_addr);
266		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_DATA);
267		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_DATA);
	287	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_BPT_DATA, id);
	288	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_BPT_DATA, id);
268	289
269		- isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC0_BP_CNT);
270		- isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC1_BP_CNT);
	290	+ isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC0_BP_CNT, id);
	291	+ isp3_param_write(params_vdev, arg->bp_cnt, ISP3X_DPCC1_BP_CNT, id);
271	292
272		- isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC0_PDAF_EN);
273		- isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC1_PDAF_EN);
	293	+ isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC0_PDAF_EN, id);
	294	+ isp3_param_write(params_vdev, arg->sw_pdaf_en, ISP3X_DPCC1_PDAF_EN, id);
274	295
275	296	value = 0;
276	297	for (i = 0; i < ISP32_DPCC_PDAF_POINT_NUM; i++)
277	298	value \|= !!arg->pdaf_point_en[i] << i;
278		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_EN);
279		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_EN);
	299	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_EN, id);
	300	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_EN, id);
280	301
281	302	value = ISP_PACK_2SHORT(arg->pdaf_offsetx, arg->pdaf_offsety);
282		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_OFFSET);
283		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_OFFSET);
	303	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_OFFSET, id);
	304	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_OFFSET, id);
284	305
285	306	value = ISP_PACK_2SHORT(arg->pdaf_wrapx, arg->pdaf_wrapy);
286		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_WRAP);
287		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_WRAP);
	307	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_WRAP, id);
	308	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_WRAP, id);
288	309
289	310	value = ISP_PACK_2SHORT(arg->pdaf_wrapx_num, arg->pdaf_wrapy_num);
290		- isp3_param_write(params_vdev, value, ISP_DPCC0_PDAF_SCOPE);
291		- isp3_param_write(params_vdev, value, ISP_DPCC1_PDAF_SCOPE);
	311	+ isp3_param_write(params_vdev, value, ISP_DPCC0_PDAF_SCOPE, id);
	312	+ isp3_param_write(params_vdev, value, ISP_DPCC1_PDAF_SCOPE, id);
292	313
293	314	for (i = 0; i < ISP32_DPCC_PDAF_POINT_NUM / 2; i++) {
294	315	value = ISP_PACK_4BYTE(arg->point[2 * i].x, arg->point[2 * i].y,
295	316	arg->point[2 * i + 1].x, arg->point[2 * i + 1].y);
296		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_0 + 4 * i);
297		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_0 + 4 * i);
	317	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_PDAF_POINT_0 + 4 * i, id);
	318	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_PDAF_POINT_0 + 4 * i, id);
298	319	}
299	320
300		- isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC0_PDAF_FORWARD_MED);
301		- isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC1_PDAF_FORWARD_MED);
	321	+ isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC0_PDAF_FORWARD_MED, id);
	322	+ isp3_param_write(params_vdev, arg->pdaf_forward_med, ISP3X_DPCC1_PDAF_FORWARD_MED, id);
302	323	}
303	324
304	325	static void
305		-isp_dpcc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	326	+isp_dpcc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
306	327	{
307	328	u32 value;
308	329
309		- value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE);
	330	+ value = isp3_param_read(params_vdev, ISP3X_DPCC0_MODE, id);
310	331	value &= ~ISP_DPCC_EN;
311	332
312	333	if (en)
313	334	value \|= ISP_DPCC_EN;
314		- isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE);
315		- isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE);
	335	+ isp3_param_write(params_vdev, value, ISP3X_DPCC0_MODE, id);
	336	+ isp3_param_write(params_vdev, value, ISP3X_DPCC1_MODE, id);
316	337	}
317	338
318	339	static void
319	340	isp_bls_config(struct rkisp_isp_params_vdev *params_vdev,
320		- const struct isp32_bls_cfg *arg)
	341	+ const struct isp32_bls_cfg *arg, u32 id)
321	342	{
322	343	const struct isp2x_bls_fixed_val *pval;
323	344	u32 new_control, value;
324	345
325		- new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL);
	346	+ new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL, id);
326	347	new_control &= (ISP_BLS_ENA \| ISP32_BLS_BLS2_EN);
327	348
328	349	pval = &arg->bls1_val;
..	..	@@ -331,29 +352,29 @@
331	352
332	353	switch (params_vdev->raw_type) {
333	354	case RAW_BGGR:
334		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_D_FIXED);
335		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_C_FIXED);
336		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_B_FIXED);
337		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_A_FIXED);
	355	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_D_FIXED, id);
	356	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_C_FIXED, id);
	357	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_B_FIXED, id);
	358	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_A_FIXED, id);
338	359	break;
339	360	case RAW_GBRG:
340		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_C_FIXED);
341		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_D_FIXED);
342		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_A_FIXED);
343		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_B_FIXED);
	361	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_C_FIXED, id);
	362	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_D_FIXED, id);
	363	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_A_FIXED, id);
	364	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_B_FIXED, id);
344	365	break;
345	366	case RAW_GRBG:
346		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_B_FIXED);
347		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_A_FIXED);
348		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_D_FIXED);
349		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_C_FIXED);
	367	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_B_FIXED, id);
	368	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_A_FIXED, id);
	369	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_D_FIXED, id);
	370	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_C_FIXED, id);
350	371	break;
351	372	case RAW_RGGB:
352	373	default:
353		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_A_FIXED);
354		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_B_FIXED);
355		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_C_FIXED);
356		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_D_FIXED);
	374	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS1_A_FIXED, id);
	375	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS1_B_FIXED, id);
	376	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS1_C_FIXED, id);
	377	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS1_D_FIXED, id);
357	378	break;
358	379	}
359	380	}
..	..	@@ -363,107 +384,107 @@
363	384	if (!arg->enable_auto) {
364	385	switch (params_vdev->raw_type) {
365	386	case RAW_BGGR:
366		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_D_FIXED);
367		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_C_FIXED);
368		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_B_FIXED);
369		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_A_FIXED);
	387	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_D_FIXED, id);
	388	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_C_FIXED, id);
	389	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_B_FIXED, id);
	390	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_A_FIXED, id);
370	391	break;
371	392	case RAW_GBRG:
372		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_C_FIXED);
373		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_D_FIXED);
374		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_A_FIXED);
375		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_B_FIXED);
	393	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_C_FIXED, id);
	394	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_D_FIXED, id);
	395	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_A_FIXED, id);
	396	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_B_FIXED, id);
376	397	break;
377	398	case RAW_GRBG:
378		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_B_FIXED);
379		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_A_FIXED);
380		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_D_FIXED);
381		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_C_FIXED);
	399	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_B_FIXED, id);
	400	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_A_FIXED, id);
	401	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_D_FIXED, id);
	402	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_C_FIXED, id);
382	403	break;
383	404	case RAW_RGGB:
384	405	default:
385		- isp3_param_write(params_vdev, pval->r, ISP3X_BLS_A_FIXED);
386		- isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_B_FIXED);
387		- isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_C_FIXED);
388		- isp3_param_write(params_vdev, pval->b, ISP3X_BLS_D_FIXED);
	406	+ isp3_param_write(params_vdev, pval->r, ISP3X_BLS_A_FIXED, id);
	407	+ isp3_param_write(params_vdev, pval->gr, ISP3X_BLS_B_FIXED, id);
	408	+ isp3_param_write(params_vdev, pval->gb, ISP3X_BLS_C_FIXED, id);
	409	+ isp3_param_write(params_vdev, pval->b, ISP3X_BLS_D_FIXED, id);
389	410	break;
390	411	}
391	412	} else {
392	413	if (arg->en_windows & BIT(1)) {
393		- isp3_param_write(params_vdev, arg->bls_window2.h_offs, ISP3X_BLS_H2_START);
	414	+ isp3_param_write(params_vdev, arg->bls_window2.h_offs, ISP3X_BLS_H2_START, id);
394	415	value = arg->bls_window2.h_offs + arg->bls_window2.h_size;
395		- isp3_param_write(params_vdev, value, ISP3X_BLS_H2_STOP);
396		- isp3_param_write(params_vdev, arg->bls_window2.v_offs, ISP3X_BLS_V2_START);
	416	+ isp3_param_write(params_vdev, value, ISP3X_BLS_H2_STOP, id);
	417	+ isp3_param_write(params_vdev, arg->bls_window2.v_offs, ISP3X_BLS_V2_START, id);
397	418	value = arg->bls_window2.v_offs + arg->bls_window2.v_size;
398		- isp3_param_write(params_vdev, value, ISP3X_BLS_V2_STOP);
	419	+ isp3_param_write(params_vdev, value, ISP3X_BLS_V2_STOP, id);
399	420	new_control \|= ISP_BLS_WINDOW_2;
400	421	}
401	422
402	423	if (arg->en_windows & BIT(0)) {
403		- isp3_param_write(params_vdev, arg->bls_window1.h_offs, ISP3X_BLS_H1_START);
	424	+ isp3_param_write(params_vdev, arg->bls_window1.h_offs, ISP3X_BLS_H1_START, id);
404	425	value = arg->bls_window1.h_offs + arg->bls_window1.h_size;
405		- isp3_param_write(params_vdev, value, ISP3X_BLS_H1_STOP);
406		- isp3_param_write(params_vdev, arg->bls_window1.v_offs, ISP3X_BLS_V1_START);
	426	+ isp3_param_write(params_vdev, value, ISP3X_BLS_H1_STOP, id);
	427	+ isp3_param_write(params_vdev, arg->bls_window1.v_offs, ISP3X_BLS_V1_START, id);
407	428	value = arg->bls_window1.v_offs + arg->bls_window1.v_size;
408		- isp3_param_write(params_vdev, value, ISP3X_BLS_V1_STOP);
	429	+ isp3_param_write(params_vdev, value, ISP3X_BLS_V1_STOP, id);
409	430	new_control \|= ISP_BLS_WINDOW_1;
410	431	}
411	432
412		- isp3_param_write(params_vdev, arg->bls_samples, ISP3X_BLS_SAMPLES);
	433	+ isp3_param_write(params_vdev, arg->bls_samples, ISP3X_BLS_SAMPLES, id);
413	434
414	435	new_control \|= ISP_BLS_MODE_MEASURED;
415	436	}
416		- isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL);
	437	+ isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL, id);
417	438
418		- isp3_param_write(params_vdev, arg->isp_ob_offset, ISP32_BLS_ISP_OB_OFFSET);
419		- isp3_param_write(params_vdev, arg->isp_ob_predgain, ISP32_BLS_ISP_OB_PREDGAIN);
420		- isp3_param_write(params_vdev, arg->isp_ob_max, ISP32_BLS_ISP_OB_MAX);
	439	+ isp3_param_write(params_vdev, arg->isp_ob_offset, ISP32_BLS_ISP_OB_OFFSET, id);
	440	+ isp3_param_write(params_vdev, arg->isp_ob_predgain, ISP32_BLS_ISP_OB_PREDGAIN, id);
	441	+ isp3_param_write(params_vdev, arg->isp_ob_max, ISP32_BLS_ISP_OB_MAX, id);
421	442	}
422	443
423	444	static void
424		-isp_bls_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	445	+isp_bls_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
425	446	{
426	447	u32 new_control;
427	448
428		- new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL);
	449	+ new_control = isp3_param_read(params_vdev, ISP3X_BLS_CTRL, id);
429	450	if (en)
430	451	new_control \|= ISP_BLS_ENA;
431	452	else
432	453	new_control &= ~ISP_BLS_ENA;
433		- isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL);
	454	+ isp3_param_write(params_vdev, new_control, ISP3X_BLS_CTRL, id);
434	455	}
435	456
436	457	static void
437	458	isp_sdg_config(struct rkisp_isp_params_vdev *params_vdev,
438		- const struct isp2x_sdg_cfg *arg)
	459	+ const struct isp2x_sdg_cfg *arg, u32 id)
439	460	{
440	461	int i;
441	462
442		- isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx0, ISP3X_ISP_GAMMA_DX_LO);
443		- isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx1, ISP3X_ISP_GAMMA_DX_HI);
	463	+ isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx0, ISP3X_ISP_GAMMA_DX_LO, id);
	464	+ isp3_param_write(params_vdev, arg->xa_pnts.gamma_dx1, ISP3X_ISP_GAMMA_DX_HI, id);
444	465
445	466	for (i = 0; i < ISP32_DEGAMMA_CURVE_SIZE; i++) {
446	467	isp3_param_write(params_vdev, arg->curve_r.gamma_y[i],
447		- ISP3X_ISP_GAMMA_R_Y_0 + i * 4);
	468	+ ISP3X_ISP_GAMMA_R_Y_0 + i * 4, id);
448	469	isp3_param_write(params_vdev, arg->curve_g.gamma_y[i],
449		- ISP3X_ISP_GAMMA_G_Y_0 + i * 4);
	470	+ ISP3X_ISP_GAMMA_G_Y_0 + i * 4, id);
450	471	isp3_param_write(params_vdev, arg->curve_b.gamma_y[i],
451		- ISP3X_ISP_GAMMA_B_Y_0 + i * 4);
	472	+ ISP3X_ISP_GAMMA_B_Y_0 + i * 4, id);
452	473	}
453	474	}
454	475
455	476	static void
456		-isp_sdg_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	477	+isp_sdg_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
457	478	{
458	479	u32 val;
459	480
460		- val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
	481	+ val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
461	482	if (en)
462	483	isp3_param_write(params_vdev, val \| CIF_ISP_CTRL_ISP_GAMMA_IN_ENA,
463		- ISP3X_ISP_CTRL0);
	484	+ ISP3X_ISP_CTRL0, id);
464	485	else
465	486	isp3_param_write(params_vdev, val & ~CIF_ISP_CTRL_ISP_GAMMA_IN_ENA,
466		- ISP3X_ISP_CTRL0);
	487	+ ISP3X_ISP_CTRL0, id);
467	488	}
468	489
469	490	static void __maybe_unused
..	..	@@ -524,21 +545,21 @@
524	545	}
525	546	rkisp_prepare_buffer(params_vdev->dev, &priv_val->buf_lsclut[buf_idx]);
526	547	data = priv_val->buf_lsclut[buf_idx].dma_addr;
527		- isp3_param_write(params_vdev, data, ISP3X_MI_LUT_LSC_RD_BASE);
528		- isp3_param_write(params_vdev, ISP32_LSC_LUT_TBL_SIZE, ISP3X_MI_LUT_LSC_RD_WSIZE);
	548	+ isp3_param_write(params_vdev, data, ISP3X_MI_LUT_LSC_RD_BASE, 0);
	549	+ isp3_param_write(params_vdev, ISP32_LSC_LUT_TBL_SIZE, ISP3X_MI_LUT_LSC_RD_WSIZE, 0);
529	550	}
530	551
531	552	static void
532	553	isp_lsc_matrix_cfg_sram(struct rkisp_isp_params_vdev *params_vdev,
533	554	const struct isp3x_lsc_cfg *pconfig,
534		- bool is_check)
	555	+ bool is_check, u32 id)
535	556	{
536	557	struct rkisp_device *dev = params_vdev->dev;
537	558	u32 sram_addr, data, table;
538	559	int i, j;
539	560
540	561	if (is_check &&
541		- !(isp3_param_read(params_vdev, ISP3X_LSC_CTRL) & ISP_LSC_EN))
	562	+ !(isp3_param_read(params_vdev, ISP3X_LSC_CTRL, id) & ISP_LSC_EN))
542	563	return;
543	564
544	565	table = isp3_param_read_direct(params_vdev, ISP3X_LSC_STATUS);
..	..	@@ -601,21 +622,21 @@
601	622	(struct rkisp_isp_params_vdev *)data;
602	623	struct isp32_isp_params_cfg *params = params_vdev->isp32_params;
603	624
604		- isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true);
	625	+ isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true, 0);
605	626	}
606	627
607	628	static void
608	629	isp_lsc_config(struct rkisp_isp_params_vdev *params_vdev,
609		- const struct isp3x_lsc_cfg *arg)
	630	+ const struct isp3x_lsc_cfg *arg, u32 id)
610	631	{
611	632	struct rkisp_isp_params_val_v32 *priv_val =
612	633	(struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
613		- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
	634	+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
614	635	struct rkisp_device *dev = params_vdev->dev;
615	636	u32 data, lsc_ctrl;
616	637	int i;
617	638
618		- lsc_ctrl = isp3_param_read(params_vdev, ISP3X_LSC_CTRL);
	639	+ lsc_ctrl = isp3_param_read(params_vdev, ISP3X_LSC_CTRL, id);
619	640	if (dev->isp_ver == ISP_V32_L) {
620	641	/* one lsc sram table
621	642	* online mode lsc lut load from ddr quick for some sensor VB short
..	..	@@ -625,7 +646,7 @@
625	646	if (!IS_HDR_RDBK(dev->rd_mode))
626	647	isp_lsc_matrix_cfg_ddr(params_vdev, arg);
627	648	else if (dev->hw_dev->is_single)
628		- isp_lsc_matrix_cfg_sram(params_vdev, arg, false);
	649	+ isp_lsc_matrix_cfg_sram(params_vdev, arg, false, id);
629	650	else
630	651	params_rec->others.lsc_cfg = *arg;
631	652	} else {
..	..	@@ -637,27 +658,27 @@
637	658	for (i = 0; i < ISP32_LSC_SIZE_TBL_SIZE / 4; i++) {
638	659	/* program x size tables */
639	660	data = CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2], arg->x_size_tbl[i * 2 + 1]);
640		- isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_01 + i * 4);
	661	+ isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_01 + i * 4, id);
641	662	data = CIF_ISP_LSC_SECT_SIZE(arg->x_size_tbl[i * 2 + 8], arg->x_size_tbl[i * 2 + 9]);
642		- isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_89 + i * 4);
	663	+ isp3_param_write(params_vdev, data, ISP3X_LSC_XSIZE_89 + i * 4, id);
643	664
644	665	/* program x grad tables */
645	666	data = CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2], arg->x_grad_tbl[i * 2 + 1]);
646		- isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_01 + i * 4);
	667	+ isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_01 + i * 4, id);
647	668	data = CIF_ISP_LSC_SECT_SIZE(arg->x_grad_tbl[i * 2 + 8], arg->x_grad_tbl[i * 2 + 9]);
648		- isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_89 + i * 4);
	669	+ isp3_param_write(params_vdev, data, ISP3X_LSC_XGRAD_89 + i * 4, id);
649	670
650	671	/* program y size tables */
651	672	data = CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2], arg->y_size_tbl[i * 2 + 1]);
652		- isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_01 + i * 4);
	673	+ isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_01 + i * 4, id);
653	674	data = CIF_ISP_LSC_SECT_SIZE(arg->y_size_tbl[i * 2 + 8], arg->y_size_tbl[i * 2 + 9]);
654		- isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_89 + i * 4);
	675	+ isp3_param_write(params_vdev, data, ISP3X_LSC_YSIZE_89 + i * 4, id);
655	676
656	677	/* program y grad tables */
657	678	data = CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2], arg->y_grad_tbl[i * 2 + 1]);
658		- isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_01 + i * 4);
	679	+ isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_01 + i * 4, id);
659	680	data = CIF_ISP_LSC_SECT_SIZE(arg->y_grad_tbl[i * 2 + 8], arg->y_grad_tbl[i * 2 + 9]);
660		- isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_89 + i * 4);
	681	+ isp3_param_write(params_vdev, data, ISP3X_LSC_YGRAD_89 + i * 4, id);
661	682	}
662	683
663	684	if (arg->sector_16x16)
..	..	@@ -666,15 +687,15 @@
666	687	lsc_ctrl &= ~ISP3X_LSC_SECTOR_16X16;
667	688	if (dev->isp_ver == ISP_V32_L && !IS_HDR_RDBK(dev->rd_mode))
668	689	lsc_ctrl \|= ISP3X_LSC_LUT_EN;
669		- isp3_param_write(params_vdev, lsc_ctrl, ISP3X_LSC_CTRL);
	690	+ isp3_param_write(params_vdev, lsc_ctrl, ISP3X_LSC_CTRL, id);
670	691	}
671	692
672	693	static void
673		-isp_lsc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	694	+isp_lsc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
674	695	{
675	696	struct rkisp_device *dev = params_vdev->dev;
676		- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
677		- u32 val = isp3_param_read(params_vdev, ISP3X_LSC_CTRL);
	697	+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
	698	+ u32 val = isp3_param_read(params_vdev, ISP3X_LSC_CTRL, id);
678	699
679	700	if (en == !!(val & ISP_LSC_EN))
680	701	return;
..	..	@@ -683,99 +704,99 @@
683	704	val = ISP_LSC_EN \| ISP32_SELF_FORCE_UPD;
684	705	if (dev->isp_ver == ISP_V32_L && !IS_HDR_RDBK(dev->rd_mode))
685	706	val \|= ISP3X_LSC_LUT_EN;
686		- isp3_param_set_bits(params_vdev, ISP3X_LSC_CTRL, val);
	707	+ isp3_param_set_bits(params_vdev, ISP3X_LSC_CTRL, val, id);
687	708	if (dev->isp_ver == ISP_V32 && params_vdev->dev->hw_dev->is_single)
688	709	isp_lsc_matrix_cfg_sram(params_vdev,
689		- &params_rec->others.lsc_cfg, false);
	710	+ &params_rec->others.lsc_cfg, false, id);
690	711	} else {
691		- isp3_param_clear_bits(params_vdev, ISP3X_LSC_CTRL, ISP_LSC_EN);
692		- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(8));
	712	+ isp3_param_clear_bits(params_vdev, ISP3X_LSC_CTRL, ISP_LSC_EN, id);
	713	+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(8), id);
693	714	}
694	715	}
695	716
696	717	static void
697	718	isp_debayer_config(struct rkisp_isp_params_vdev *params_vdev,
698		- const struct isp32_debayer_cfg *arg)
	719	+ const struct isp32_debayer_cfg *arg, u32 id)
699	720	{
700	721	u32 value;
701	722
702		- value = isp3_param_read(params_vdev, ISP3X_DEBAYER_CONTROL);
	723	+ value = isp3_param_read(params_vdev, ISP3X_DEBAYER_CONTROL, id);
703	724	value &= ISP_DEBAYER_EN;
704	725
705	726	value \|= !!arg->filter_g_en << 4;
706	727	if (params_vdev->dev->isp_ver == ISP_V32)
707	728	value \|= !!arg->filter_c_en << 8;
708		- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_CONTROL);
	729	+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_CONTROL, id);
709	730
710	731	value = (arg->max_ratio & 0x3F) << 24 \| arg->select_thed << 16 \|
711	732	(arg->thed1 & 0x0F) << 12 \| (arg->thed0 & 0x0F) << 8 \|
712	733	(arg->dist_scale & 0x0F) << 4 \| !!arg->clip_en;
713		- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP);
	734	+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP, id);
714	735
715	736	value = (arg->filter1_coe4 & 0x1F) << 24 \| (arg->filter1_coe3 & 0x1F) << 16 \|
716	737	(arg->filter1_coe2 & 0x1F) << 8 \| (arg->filter1_coe1 & 0x1F);
717		- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER1);
	738	+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER1, id);
718	739
719	740	value = (arg->filter2_coe4 & 0x1F) << 24 \| (arg->filter2_coe3 & 0x1F) << 16 \|
720	741	(arg->filter2_coe2 & 0x1F) << 8 \| (arg->filter2_coe1 & 0x1F);
721		- isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER2);
	742	+ isp3_param_write(params_vdev, value, ISP3X_DEBAYER_G_INTERP_FILTER2, id);
722	743
723	744	value = arg->hf_offset << 16 \| (arg->gain_offset & 0xFFF);
724		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_INTERP_OFFSET);
	745	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_INTERP_OFFSET, id);
725	746
726	747	value = (arg->offset & 0x7FF);
727		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_FILTER_OFFSET);
	748	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_G_FILTER_OFFSET, id);
728	749
729	750	if (params_vdev->dev->isp_ver != ISP_V32)
730	751	return;
731	752
732	753	value = arg->guid_gaus_coe2 << 16 \|
733	754	arg->guid_gaus_coe1 << 8 \| arg->guid_gaus_coe0;
734		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_GUIDE_GAUS);
	755	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_GUIDE_GAUS, id);
735	756
736	757	value = arg->ce_gaus_coe2 << 16 \|
737	758	arg->ce_gaus_coe1 << 8 \| arg->ce_gaus_coe0;
738		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_CE_GAUS);
	759	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_CE_GAUS, id);
739	760
740	761	value = arg->alpha_gaus_coe2 << 16 \|
741	762	arg->alpha_gaus_coe1 << 8 \| arg->alpha_gaus_coe0;
742		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA_GAUS);
	763	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA_GAUS, id);
743	764
744	765	value = (arg->loggd_offset & 0xfff) << 16 \| (arg->loghf_offset & 0x1fff);
745		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_LOG_OFFSET);
	766	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_LOG_OFFSET, id);
746	767
747	768	value = (arg->alpha_scale & 0xfffff) << 12 \| (arg->alpha_offset & 0xfff);
748		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA);
	769	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_ALPHA, id);
749	770
750	771	value = (arg->edge_scale & 0xfffff) << 12 \| (arg->edge_offset & 0xfff);
751		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_EDGE);
	772	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_EDGE, id);
752	773
753	774	value = (arg->wgtslope & 0xfff) << 16 \|
754	775	(arg->exp_shift & 0x3f) << 8 \| arg->ce_sgm;
755		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_0);
	776	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_0, id);
756	777
757	778	value = (arg->wet_ghost & 0x3f) << 8 \| (arg->wet_clip & 0x7f);
758		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_1);
	779	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_IIR_1, id);
759	780
760	781	value = (arg->bf_curwgt & 0x7f) << 24 \|
761	782	(arg->bf_clip & 0x7f) << 16 \| arg->bf_sgm;
762		- isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_BF);
	783	+ isp3_param_write(params_vdev, value, ISP32_DEBAYER_C_FILTER_BF, id);
763	784	}
764	785
765	786	static void
766		-isp_debayer_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	787	+isp_debayer_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
767	788	{
768	789	if (en)
769	790	isp3_param_set_bits(params_vdev,
770		- ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN);
	791	+ ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN, id);
771	792	else
772	793	isp3_param_clear_bits(params_vdev,
773		- ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN);
	794	+ ISP3X_DEBAYER_CONTROL, ISP32_MODULE_EN, id);
774	795	}
775	796
776	797	static void
777	798	isp_awbgain_config(struct rkisp_isp_params_vdev *params_vdev,
778		- const struct isp32_awb_gain_cfg *arg)
	799	+ const struct isp32_awb_gain_cfg *arg, u32 id)
779	800	{
780	801	struct rkisp_device *dev = params_vdev->dev;
781	802
..	..	@@ -791,184 +812,184 @@
791	812
792	813	isp3_param_write(params_vdev,
793	814	ISP_PACK_2SHORT(arg->gain0_green_b, arg->gain0_green_r),
794		- ISP3X_ISP_AWB_GAIN0_G);
	815	+ ISP3X_ISP_AWB_GAIN0_G, id);
795	816	isp3_param_write(params_vdev,
796	817	ISP_PACK_2SHORT(arg->gain0_blue, arg->gain0_red),
797		- ISP3X_ISP_AWB_GAIN0_RB);
	818	+ ISP3X_ISP_AWB_GAIN0_RB, id);
798	819
799	820	isp3_param_write(params_vdev,
800	821	ISP_PACK_2SHORT(arg->gain1_green_b, arg->gain1_green_r),
801		- ISP3X_ISP_AWB_GAIN1_G);
	822	+ ISP3X_ISP_AWB_GAIN1_G, id);
802	823	isp3_param_write(params_vdev,
803	824	ISP_PACK_2SHORT(arg->gain1_blue, arg->gain1_red),
804		- ISP3X_ISP_AWB_GAIN1_RB);
	825	+ ISP3X_ISP_AWB_GAIN1_RB, id);
805	826
806	827	isp3_param_write(params_vdev,
807	828	ISP_PACK_2SHORT(arg->gain2_green_b, arg->gain2_green_r),
808		- ISP3X_ISP_AWB_GAIN2_G);
	829	+ ISP3X_ISP_AWB_GAIN2_G, id);
809	830	isp3_param_write(params_vdev,
810	831	ISP_PACK_2SHORT(arg->gain2_blue, arg->gain2_red),
811		- ISP3X_ISP_AWB_GAIN2_RB);
	832	+ ISP3X_ISP_AWB_GAIN2_RB, id);
812	833
813	834	isp3_param_write(params_vdev,
814	835	ISP_PACK_2SHORT(arg->awb1_gain_gb, arg->awb1_gain_gr),
815		- ISP32_ISP_AWB1_GAIN_G);
	836	+ ISP32_ISP_AWB1_GAIN_G, id);
816	837	isp3_param_write(params_vdev,
817	838	ISP_PACK_2SHORT(arg->awb1_gain_b, arg->awb1_gain_r),
818		- ISP32_ISP_AWB1_GAIN_RB);
	839	+ ISP32_ISP_AWB1_GAIN_RB, id);
819	840	}
820	841
821	842	static void
822		-isp_awbgain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	843	+isp_awbgain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
823	844	{
824	845	u32 val;
825	846
826		- val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
	847	+ val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
827	848	if (en)
828	849	isp3_param_write(params_vdev, val \| CIF_ISP_CTRL_ISP_AWB_ENA,
829		- ISP3X_ISP_CTRL0);
	850	+ ISP3X_ISP_CTRL0, id);
830	851	else
831	852	isp3_param_write(params_vdev, val & ~CIF_ISP_CTRL_ISP_AWB_ENA,
832		- ISP3X_ISP_CTRL0);
	853	+ ISP3X_ISP_CTRL0, id);
833	854	}
834	855
835	856	static void
836	857	isp_ccm_config(struct rkisp_isp_params_vdev *params_vdev,
837		- const struct isp32_ccm_cfg *arg)
	858	+ const struct isp32_ccm_cfg *arg, u32 id)
838	859	{
839	860	u32 value;
840	861	u32 i;
841	862
842		- value = isp3_param_read(params_vdev, ISP3X_CCM_CTRL);
	863	+ value = isp3_param_read(params_vdev, ISP3X_CCM_CTRL, id);
843	864	value &= ISP_CCM_EN;
844	865
845	866	value \|= !!arg->asym_adj_en << 3 \|
846	867	!!arg->enh_adj_en << 2 \|
847	868	!!arg->highy_adjust_dis << 1;
848		- isp3_param_write(params_vdev, value, ISP3X_CCM_CTRL);
	869	+ isp3_param_write(params_vdev, value, ISP3X_CCM_CTRL, id);
849	870
850	871	value = ISP_PACK_2SHORT(arg->coeff0_r, arg->coeff1_r);
851		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_R);
	872	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_R, id);
852	873
853	874	value = ISP_PACK_2SHORT(arg->coeff2_r, arg->offset_r);
854		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_R);
	875	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_R, id);
855	876
856	877	value = ISP_PACK_2SHORT(arg->coeff0_g, arg->coeff1_g);
857		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_G);
	878	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_G, id);
858	879
859	880	value = ISP_PACK_2SHORT(arg->coeff2_g, arg->offset_g);
860		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_G);
	881	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_G, id);
861	882
862	883	value = ISP_PACK_2SHORT(arg->coeff0_b, arg->coeff1_b);
863		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_B);
	884	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_B, id);
864	885
865	886	value = ISP_PACK_2SHORT(arg->coeff2_b, arg->offset_b);
866		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_B);
	887	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_B, id);
867	888
868	889	value = ISP_PACK_2SHORT(arg->coeff0_y, arg->coeff1_y);
869		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_Y);
	890	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF0_Y, id);
870	891
871	892	value = ISP_PACK_2SHORT(arg->coeff2_y, 0);
872		- isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_Y);
	893	+ isp3_param_write(params_vdev, value, ISP3X_CCM_COEFF1_Y, id);
873	894
874	895	for (i = 0; i < ISP32_CCM_CURVE_NUM / 2; i++) {
875	896	value = ISP_PACK_2SHORT(arg->alp_y[2 * i], arg->alp_y[2 * i + 1]);
876		- isp3_param_write(params_vdev, value, ISP3X_CCM_ALP_Y0 + 4 * i);
	897	+ isp3_param_write(params_vdev, value, ISP3X_CCM_ALP_Y0 + 4 * i, id);
877	898	}
878	899
879	900	value = (arg->right_bit & 0xf) << 4 \| (arg->bound_bit & 0xf);
880		- isp3_param_write(params_vdev, value, ISP3X_CCM_BOUND_BIT);
	901	+ isp3_param_write(params_vdev, value, ISP3X_CCM_BOUND_BIT, id);
881	902
882	903	value = (arg->color_coef1_g2y & 0x7ff) << 16 \|
883	904	(arg->color_coef0_r2y & 0x7ff);
884		- isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE0);
	905	+ isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE0, id);
885	906
886	907	value = (arg->color_enh_rat_max & 0x3fff) << 16 \|
887	908	(arg->color_coef2_b2y & 0x7ff);
888		- isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE1);
	909	+ isp3_param_write(params_vdev, value, ISP32_CCM_ENHANCE1, id);
889	910	}
890	911
891	912	static void
892		-isp_ccm_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	913	+isp_ccm_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
893	914	{
894	915	if (en)
895		- isp3_param_set_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN);
	916	+ isp3_param_set_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN, id);
896	917	else
897		- isp3_param_clear_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN);
	918	+ isp3_param_clear_bits(params_vdev, ISP3X_CCM_CTRL, ISP_CCM_EN, id);
898	919	}
899	920
900	921	static void
901	922	isp_goc_config(struct rkisp_isp_params_vdev *params_vdev,
902		- const struct isp3x_gammaout_cfg *arg)
	923	+ const struct isp3x_gammaout_cfg *arg, u32 id)
903	924	{
904	925	int i;
905	926	u32 value;
906	927
907		- value = isp3_param_read(params_vdev, ISP3X_GAMMA_OUT_CTRL);
	928	+ value = isp3_param_read(params_vdev, ISP3X_GAMMA_OUT_CTRL, id);
908	929	value &= ISP3X_GAMMA_OUT_EN;
909	930	value \|= !!arg->equ_segm << 1 \| !!arg->finalx4_dense_en << 2;
910		- isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_CTRL);
	931	+ isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_CTRL, id);
911	932
912		- isp3_param_write(params_vdev, arg->offset, ISP3X_GAMMA_OUT_OFFSET);
	933	+ isp3_param_write(params_vdev, arg->offset, ISP3X_GAMMA_OUT_OFFSET, id);
913	934	for (i = 0; i < ISP32_GAMMA_OUT_MAX_SAMPLES / 2; i++) {
914	935	value = ISP_PACK_2SHORT(arg->gamma_y[2 * i],
915	936	arg->gamma_y[2 * i + 1]);
916		- isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_Y0 + i * 4);
	937	+ isp3_param_write(params_vdev, value, ISP3X_GAMMA_OUT_Y0 + i * 4, id);
917	938	}
918		- isp3_param_write(params_vdev, arg->gamma_y[2 * i], ISP3X_GAMMA_OUT_Y0 + i * 4);
	939	+ isp3_param_write(params_vdev, arg->gamma_y[2 * i], ISP3X_GAMMA_OUT_Y0 + i * 4, id);
919	940	}
920	941
921	942	static void
922		-isp_goc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	943	+isp_goc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
923	944	{
924	945	if (en)
925		- isp3_param_set_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN);
	946	+ isp3_param_set_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN, id);
926	947	else
927		- isp3_param_clear_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN);
	948	+ isp3_param_clear_bits(params_vdev, ISP3X_GAMMA_OUT_CTRL, ISP3X_GAMMA_OUT_EN, id);
928	949	}
929	950
930	951	static void
931	952	isp_cproc_config(struct rkisp_isp_params_vdev *params_vdev,
932		- const struct isp2x_cproc_cfg *arg)
	953	+ const struct isp2x_cproc_cfg *arg, u32 id)
933	954	{
934	955	u32 quantization = params_vdev->quantization;
935	956
936		- isp3_param_write(params_vdev, arg->contrast, ISP3X_CPROC_CONTRAST);
937		- isp3_param_write(params_vdev, arg->hue, ISP3X_CPROC_HUE);
938		- isp3_param_write(params_vdev, arg->sat, ISP3X_CPROC_SATURATION);
939		- isp3_param_write(params_vdev, arg->brightness, ISP3X_CPROC_BRIGHTNESS);
	957	+ isp3_param_write(params_vdev, arg->contrast, ISP3X_CPROC_CONTRAST, id);
	958	+ isp3_param_write(params_vdev, arg->hue, ISP3X_CPROC_HUE, id);
	959	+ isp3_param_write(params_vdev, arg->sat, ISP3X_CPROC_SATURATION, id);
	960	+ isp3_param_write(params_vdev, arg->brightness, ISP3X_CPROC_BRIGHTNESS, id);
940	961
941	962	if (quantization != V4L2_QUANTIZATION_FULL_RANGE) {
942	963	isp3_param_clear_bits(params_vdev, ISP3X_CPROC_CTRL,
943	964	CIF_C_PROC_YOUT_FULL \|
944	965	CIF_C_PROC_YIN_FULL \|
945		- CIF_C_PROC_COUT_FULL);
	966	+ CIF_C_PROC_COUT_FULL, id);
946	967	} else {
947	968	isp3_param_set_bits(params_vdev, ISP3X_CPROC_CTRL,
948	969	CIF_C_PROC_YOUT_FULL \|
949	970	CIF_C_PROC_YIN_FULL \|
950		- CIF_C_PROC_COUT_FULL);
	971	+ CIF_C_PROC_COUT_FULL, id);
951	972	}
952	973	}
953	974
954	975	static void
955		-isp_cproc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	976	+isp_cproc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
956	977	{
957	978	if (en)
958	979	isp3_param_set_bits(params_vdev, ISP3X_CPROC_CTRL,
959		- CIF_C_PROC_CTR_ENABLE);
	980	+ CIF_C_PROC_CTR_ENABLE, id);
960	981	else
961	982	isp3_param_clear_bits(params_vdev, ISP3X_CPROC_CTRL,
962		- CIF_C_PROC_CTR_ENABLE);
	983	+ CIF_C_PROC_CTR_ENABLE, id);
963	984	}
964	985
965	986	static void
966	987	isp_ie_config(struct rkisp_isp_params_vdev *params_vdev,
967		- const struct isp2x_ie_cfg *arg)
	988	+ const struct isp2x_ie_cfg *arg, u32 id)
968	989	{
969	990	u32 eff_ctrl;
970	991
971		- eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL);
	992	+ eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL, id);
972	993	eff_ctrl &= ~CIF_IMG_EFF_CTRL_MODE_MASK;
973	994
974	995	if (params_vdev->quantization == V4L2_QUANTIZATION_FULL_RANGE)
..	..	@@ -979,7 +1000,7 @@
979	1000	eff_ctrl \|= CIF_IMG_EFF_CTRL_MODE_SEPIA;
980	1001	break;
981	1002	case V4L2_COLORFX_SET_CBCR:
982		- isp3_param_write(params_vdev, arg->eff_tint, ISP3X_IMG_EFF_TINT);
	1003	+ isp3_param_write(params_vdev, arg->eff_tint, ISP3X_IMG_EFF_TINT, id);
983	1004	eff_ctrl \|= CIF_IMG_EFF_CTRL_MODE_SEPIA;
984	1005	break;
985	1006	/*
..	..	@@ -989,25 +1010,25 @@
989	1010	case V4L2_COLORFX_AQUA:
990	1011	eff_ctrl \|= CIF_IMG_EFF_CTRL_MODE_COLOR_SEL;
991	1012	isp3_param_write(params_vdev, arg->color_sel,
992		- ISP3X_IMG_EFF_COLOR_SEL);
	1013	+ ISP3X_IMG_EFF_COLOR_SEL, id);
993	1014	break;
994	1015	case V4L2_COLORFX_EMBOSS:
995	1016	eff_ctrl \|= CIF_IMG_EFF_CTRL_MODE_EMBOSS;
996	1017	isp3_param_write(params_vdev, arg->eff_mat_1,
997		- CIF_IMG_EFF_MAT_1);
	1018	+ CIF_IMG_EFF_MAT_1, id);
998	1019	isp3_param_write(params_vdev, arg->eff_mat_2,
999		- CIF_IMG_EFF_MAT_2);
	1020	+ CIF_IMG_EFF_MAT_2, id);
1000	1021	isp3_param_write(params_vdev, arg->eff_mat_3,
1001		- CIF_IMG_EFF_MAT_3);
	1022	+ CIF_IMG_EFF_MAT_3, id);
1002	1023	break;
1003	1024	case V4L2_COLORFX_SKETCH:
1004	1025	eff_ctrl \|= CIF_IMG_EFF_CTRL_MODE_SKETCH;
1005	1026	isp3_param_write(params_vdev, arg->eff_mat_3,
1006		- CIF_IMG_EFF_MAT_3);
	1027	+ CIF_IMG_EFF_MAT_3, id);
1007	1028	isp3_param_write(params_vdev, arg->eff_mat_4,
1008		- CIF_IMG_EFF_MAT_4);
	1029	+ CIF_IMG_EFF_MAT_4, id);
1009	1030	isp3_param_write(params_vdev, arg->eff_mat_5,
1010		- CIF_IMG_EFF_MAT_5);
	1031	+ CIF_IMG_EFF_MAT_5, id);
1011	1032	break;
1012	1033	case V4L2_COLORFX_BW:
1013	1034	eff_ctrl \|= CIF_IMG_EFF_CTRL_MODE_BLACKWHITE;
..	..	@@ -1019,25 +1040,26 @@
1019	1040	break;
1020	1041	}
1021	1042
1022		- isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL);
	1043	+ isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL, id);
1023	1044	}
1024	1045
1025	1046	static void
1026		-isp_ie_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1047	+isp_ie_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1027	1048	{
1028	1049	if (en) {
1029	1050	isp3_param_set_bits(params_vdev, ISP3X_IMG_EFF_CTRL,
1030	1051	CIF_IMG_EFF_CTRL_CFG_UPD \|
1031		- CIF_IMG_EFF_CTRL_ENABLE);
	1052	+ CIF_IMG_EFF_CTRL_ENABLE, id);
1032	1053	} else {
1033	1054	isp3_param_clear_bits(params_vdev, ISP3X_IMG_EFF_CTRL,
1034		- CIF_IMG_EFF_CTRL_ENABLE);
	1055	+ CIF_IMG_EFF_CTRL_ENABLE, id);
1035	1056	}
1036	1057	}
1037	1058
1038	1059	static void
1039	1060	isp_rawae_config_foraf(struct rkisp_isp_params_vdev *params_vdev,
1040		- const struct isp32_rawaf_meas_cfg *arg)
	1061	+ const struct isp32_rawaf_meas_cfg *arg,
	1062	+ struct isp2x_window *win, u32 id)
1041	1063	{
1042	1064	u32 block_hsize, block_vsize;
1043	1065	u32 addr, value;
..	..	@@ -1052,33 +1074,40 @@
1052	1074	} else {
1053	1075	addr = ISP3X_RAWAE_BIG1_BASE;
1054	1076	}
1055		- value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
	1077	+ value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
1056	1078	value &= ISP3X_RAWAE_BIG_EN;
1057	1079
1058	1080	value \|= ISP3X_RAWAE_BIG_WND0_NUM(wnd_num_idx);
1059		- isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL);
	1081	+ isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL, id);
1060	1082
1061	1083	isp3_param_write(params_vdev,
1062		- ISP_PACK_2SHORT(arg->win[0].h_offs, arg->win[0].v_offs),
1063		- addr + ISP3X_RAWAE_BIG_OFFSET);
	1084	+ ISP_PACK_2SHORT(win->h_offs, win->v_offs),
	1085	+ addr + ISP3X_RAWAE_BIG_OFFSET, id);
1064	1086
1065		- block_hsize = arg->win[0].h_size / ae_wnd_num[wnd_num_idx];
1066		- block_vsize = arg->win[0].v_size / ae_wnd_num[wnd_num_idx];
	1087	+ block_hsize = win->h_size / ae_wnd_num[wnd_num_idx];
	1088	+ block_vsize = win->v_size / ae_wnd_num[wnd_num_idx];
1067	1089	isp3_param_write(params_vdev,
1068	1090	ISP_PACK_2SHORT(block_hsize, block_vsize),
1069		- addr + ISP3X_RAWAE_BIG_BLK_SIZE);
	1091	+ addr + ISP3X_RAWAE_BIG_BLK_SIZE, id);
1070	1092	}
1071	1093
1072	1094	static void
1073	1095	isp_rawaf_config(struct rkisp_isp_params_vdev *params_vdev,
1074		- const struct isp32_rawaf_meas_cfg *arg)
	1096	+ const struct isp32_rawaf_meas_cfg *arg, u32 id)
1075	1097	{
	1098	+ struct rkisp_device *dev = params_vdev->dev;
	1099	+ struct v4l2_rect *out_crop = &dev->isp_sdev.out_crop;
	1100	+ u32 width = out_crop->width, height = out_crop->height;
1076	1101	u32 i, var, ctrl;
1077	1102	u16 h_size, v_size;
1078	1103	u16 h_offs, v_offs;
1079	1104	u8 gaus_en, viir_en, v1_fir_sel;
1080	1105	size_t num_of_win = min_t(size_t, ARRAY_SIZE(arg->win),
1081	1106	arg->num_afm_win);
	1107	+ struct isp2x_window win_ae;
	1108	+
	1109	+ if (dev->hw_dev->unite)
	1110	+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
1082	1111
1083	1112	for (i = 0; i < num_of_win; i++) {
1084	1113	h_size = arg->win[i].h_size;
..	..	@@ -1086,9 +1115,19 @@
1086	1115	h_offs = arg->win[i].h_offs < 2 ? 2 : arg->win[i].h_offs;
1087	1116	v_offs = arg->win[i].v_offs < 1 ? 1 : arg->win[i].v_offs;
1088	1117
	1118	+ if (!v_size \|\| v_size + v_offs - 2 > height)
	1119	+ v_size = height - v_offs - 2;
	1120	+ if (!h_size \|\| h_size + h_offs - 2 > width)
	1121	+ h_size = width - h_offs - 2;
	1122	+
1089	1123	if (i == 0) {
1090	1124	h_size = h_size / 15 * 15;
1091	1125	v_size = v_size / 15 * 15;
	1126	+
	1127	+ win_ae.h_size = h_size;
	1128	+ win_ae.v_size = v_size;
	1129	+ win_ae.h_offs = h_offs;
	1130	+ win_ae.v_offs = v_offs;
1092	1131	}
1093	1132
1094	1133	/*
..	..	@@ -1097,7 +1136,7 @@
1097	1136	*/
1098	1137	isp3_param_write(params_vdev,
1099	1138	ISP_PACK_2SHORT(v_offs, h_offs),
1100		- ISP3X_RAWAF_OFFSET_WINA + i * 8);
	1139	+ ISP3X_RAWAF_OFFSET_WINA + i * 8, id);
1101	1140
1102	1141	/*
1103	1142	* value must be smaller than [width of picture -2]
..	..	@@ -1105,7 +1144,7 @@
1105	1144	*/
1106	1145	isp3_param_write(params_vdev,
1107	1146	ISP_PACK_2SHORT(v_size, h_size),
1108		- ISP3X_RAWAF_SIZE_WINA + i * 8);
	1147	+ ISP3X_RAWAF_SIZE_WINA + i * 8, id);
1109	1148	}
1110	1149
1111	1150	var = 0;
..	..	@@ -1114,60 +1153,60 @@
1114	1153	var \|= ISP3X_RAWAF_INTLINE0_EN << i;
1115	1154	var \|= ISP3X_RAWAF_INELINE0(arg->line_num[i]) << 4 * i;
1116	1155	}
1117		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_INT_LINE);
	1156	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_INT_LINE, id);
1118	1157
1119	1158	if (params_vdev->dev->isp_ver == ISP_V32_L) {
1120	1159	var = (arg->hldg_dilate_num & 0x7) << 16 \|
1121	1160	!!arg->bls_en << 12 \| (arg->bls_offset & 0x1FF);
1122		- isp3_param_write(params_vdev, var, ISP32L_RAWAF_CTRL1);
	1161	+ isp3_param_write(params_vdev, var, ISP32L_RAWAF_CTRL1, id);
1123	1162	}
1124	1163
1125		- var = isp3_param_read(params_vdev, ISP3X_RAWAF_THRES);
	1164	+ var = isp3_param_read(params_vdev, ISP3X_RAWAF_THRES, id);
1126	1165	var &= ~0xFFFF;
1127	1166	var \|= arg->afm_thres;
1128		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_THRES);
	1167	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_THRES, id);
1129	1168
1130	1169	var = (arg->lum_var_shift[1] & 0x7) << 20 \| (arg->lum_var_shift[0] & 0x7) << 16 \|
1131	1170	(arg->afm_var_shift[1] & 0x7) << 4 \| (arg->afm_var_shift[0] & 0x7);
1132	1171	if (params_vdev->dev->isp_ver == ISP_V32_L)
1133	1172	var \|= (arg->tnrin_shift & 0xf) << 8;
1134		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_VAR_SHIFT);
	1173	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_VAR_SHIFT, id);
1135	1174
1136	1175	for (i = 0; i < ISP32_RAWAF_GAMMA_NUM / 2; i++) {
1137	1176	var = ISP_PACK_2SHORT(arg->gamma_y[2 * i], arg->gamma_y[2 * i + 1]);
1138		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y0 + i * 4);
	1177	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y0 + i * 4, id);
1139	1178	}
1140	1179	var = ISP_PACK_2SHORT(arg->gamma_y[16], 0);
1141		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y8);
	1180	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_GAMMA_Y8, id);
1142	1181
1143	1182	var = (arg->v1iir_var_shift & 0x7) << 8 \| (arg->h1iir_var_shift & 0x7);
1144	1183	if (params_vdev->dev->isp_ver == ISP_V32)
1145	1184	var \|= (arg->v2iir_var_shift & 0x7) << 12 \| (arg->h2iir_var_shift & 0x7) << 4;
1146		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_HVIIR_VAR_SHIFT);
	1185	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_HVIIR_VAR_SHIFT, id);
1147	1186
1148	1187	var = ISP_PACK_2SHORT(arg->h_fv_thresh, arg->v_fv_thresh);
1149		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_HIIR_THRESH);
	1188	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_HIIR_THRESH, id);
1150	1189
1151	1190	for (i = 0; i < ISP32_RAWAF_VFIR_COE_NUM; i++) {
1152	1191	var = ISP_PACK_2SHORT(arg->v1fir_coe[i], arg->v2fir_coe[i]);
1153		- isp3_param_write(params_vdev, var, ISP32_RAWAF_V_FIR_COE0 + i * 4);
	1192	+ isp3_param_write(params_vdev, var, ISP32_RAWAF_V_FIR_COE0 + i * 4, id);
1154	1193	}
1155	1194
1156	1195	for (i = 0; i < ISP32_RAWAF_GAUS_COE_NUM / 4; i++) {
1157	1196	var = ISP_PACK_4BYTE(arg->gaus_coe[i * 4], arg->gaus_coe[i * 4 + 1],
1158	1197	arg->gaus_coe[i * 4 + 2], arg->gaus_coe[i * 4 + 3]);
1159		- isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE03 + i * 4);
	1198	+ isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE03 + i * 4, id);
1160	1199	}
1161	1200	var = ISP_PACK_4BYTE(arg->gaus_coe[ISP32_RAWAF_GAUS_COE_NUM - 1], 0, 0, 0);
1162		- isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE8);
	1201	+ isp3_param_write(params_vdev, var, ISP32_RAWAF_GAUS_COE8, id);
1163	1202
1164		- isp3_param_write(params_vdev, arg->highlit_thresh, ISP3X_RAWAF_HIGHLIT_THRESH);
	1203	+ isp3_param_write(params_vdev, arg->highlit_thresh, ISP3X_RAWAF_HIGHLIT_THRESH, id);
1165	1204
1166	1205	if (params_vdev->dev->isp_ver == ISP_V32_L) {
1167	1206	var = ISP_PACK_2SHORT(arg->h_fv_limit, arg->h_fv_slope);
1168		- isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_H);
	1207	+ isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_H, id);
1169	1208	var = ISP_PACK_2SHORT(arg->v_fv_limit, arg->v_fv_slope);
1170		- isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_V);
	1209	+ isp3_param_write(params_vdev, var, ISP32L_RAWAF_CORING_V, id);
1171	1210	}
1172	1211
1173	1212	viir_en = arg->viir_en;
..	..	@@ -1176,23 +1215,23 @@
1176	1215	if (viir_en == 0)
1177	1216	v1_fir_sel = 0;
1178	1217
1179		- ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL);
	1218	+ ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL, id);
1180	1219	ctrl &= ISP3X_RAWAF_EN;
1181	1220	if (arg->hiir_en) {
1182	1221	ctrl \|= ISP3X_RAWAF_HIIR_EN;
1183	1222	for (i = 0; i < ISP32_RAWAF_HIIR_COE_NUM / 2; i++) {
1184	1223	var = ISP_PACK_2SHORT(arg->h1iir1_coe[i * 2], arg->h1iir1_coe[i * 2 + 1]);
1185		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR1_COE01 + i * 4);
	1224	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR1_COE01 + i * 4, id);
1186	1225	var = ISP_PACK_2SHORT(arg->h1iir2_coe[i * 2], arg->h1iir2_coe[i * 2 + 1]);
1187		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR2_COE01 + i * 4);
	1226	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H1_IIR2_COE01 + i * 4, id);
1188	1227
1189	1228	if (params_vdev->dev->isp_ver == ISP_V32_L)
1190	1229	continue;
1191	1230
1192	1231	var = ISP_PACK_2SHORT(arg->h2iir1_coe[i * 2], arg->h2iir1_coe[i * 2 + 1]);
1193		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR1_COE01 + i * 4);
	1232	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR1_COE01 + i * 4, id);
1194	1233	var = ISP_PACK_2SHORT(arg->h2iir2_coe[i * 2], arg->h2iir2_coe[i * 2 + 1]);
1195		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR2_COE01 + i * 4);
	1234	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_H2_IIR2_COE01 + i * 4, id);
1196	1235	}
1197	1236	}
1198	1237	if (viir_en) {
..	..	@@ -1202,7 +1241,7 @@
1202	1241	var = ISP_PACK_2SHORT(arg->v1iir_coe[i], arg->v2iir_coe[i]);
1203	1242	else
1204	1243	var = ISP_PACK_2SHORT(arg->v1iir_coe[i], 0);
1205		- isp3_param_write(params_vdev, var, ISP3X_RAWAF_V_IIR_COE0 + i * 4);
	1244	+ isp3_param_write(params_vdev, var, ISP3X_RAWAF_V_IIR_COE0 + i * 4, id);
1206	1245	}
1207	1246	}
1208	1247	if (arg->ldg_en) {
..	..	@@ -1212,12 +1251,12 @@
1212	1251	arg->curve_h[i].ldg_lumth \|
1213	1252	arg->curve_h[i].ldg_gain << 8 \|
1214	1253	arg->curve_h[i].ldg_gslp << 16,
1215		- ISP3X_RAWAF_H_CURVEL + i * 16);
	1254	+ ISP3X_RAWAF_H_CURVEL + i * 16, id);
1216	1255	isp3_param_write(params_vdev,
1217	1256	arg->curve_v[i].ldg_lumth \|
1218	1257	arg->curve_v[i].ldg_gain << 8 \|
1219	1258	arg->curve_v[i].ldg_gslp << 16,
1220		- ISP3X_RAWAF_V_CURVEL + i * 16);
	1259	+ ISP3X_RAWAF_V_CURVEL + i * 16, id);
1221	1260	}
1222	1261	}
1223	1262
..	..	@@ -1239,9 +1278,9 @@
1239	1278	!!arg->v1_acc_mode << 26 \|
1240	1279	!!arg->v2_acc_mode << 27 \|
1241	1280	!!arg->ae_sel << 29;
1242		- isp3_param_write(params_vdev, ctrl, ISP3X_RAWAF_CTRL);
	1281	+ isp3_param_write(params_vdev, ctrl, ISP3X_RAWAF_CTRL, id);
1243	1282
1244		- ctrl = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
	1283	+ ctrl = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
1245	1284	if (((ctrl & ISP3X_RAWAF_SEL(3)) != ISP3X_RAWAF_SEL(arg->rawaf_sel)) \|\|
1246	1285	(((!!(ctrl & ISP32L_BNR2AF_SEL)) != arg->bnr2af_sel) &&
1247	1286	(params_vdev->dev->isp_ver == ISP_V32_L))) {
..	..	@@ -1254,16 +1293,16 @@
1254	1293	else
1255	1294	ctrl &= ~ISP32L_BNR2AF_SEL;
1256	1295	}
1257		- isp3_param_write(params_vdev, ctrl, ISP3X_VI_ISP_PATH);
	1296	+ isp3_param_write(params_vdev, ctrl, ISP3X_VI_ISP_PATH, id);
1258	1297	}
1259	1298
1260	1299	params_vdev->afaemode_en = arg->ae_mode;
1261	1300	if (params_vdev->afaemode_en)
1262		- isp_rawae_config_foraf(params_vdev, arg);
	1301	+ isp_rawae_config_foraf(params_vdev, arg, &win_ae, id);
1263	1302	}
1264	1303
1265	1304	static void
1266		-isp_rawae_enable_foraf(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1305	+isp_rawae_enable_foraf(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1267	1306	{
1268	1307	u32 exp_ctrl;
1269	1308	u32 addr = ISP3X_RAWAE_BIG1_BASE;
..	..	@@ -1271,20 +1310,20 @@
1271	1310	if (params_vdev->dev->isp_ver == ISP_V32_L)
1272	1311	addr = ISP3X_RAWAE_LITE_BASE;
1273	1312
1274		- exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
	1313	+ exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
1275	1314	exp_ctrl &= ~ISP32_REG_WR_MASK;
1276	1315	if (en)
1277	1316	exp_ctrl \|= ISP32_MODULE_EN;
1278	1317	else
1279	1318	exp_ctrl &= ~ISP32_MODULE_EN;
1280	1319
1281		- isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL);
	1320	+ isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL, id);
1282	1321	}
1283	1322
1284	1323	static void
1285		-isp_rawaf_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1324	+isp_rawaf_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1286	1325	{
1287		- u32 afm_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL);
	1326	+ u32 afm_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAF_CTRL, id);
1288	1327
1289	1328	afm_ctrl &= ~ISP32_REG_WR_MASK;
1290	1329	if (en)
..	..	@@ -1292,9 +1331,9 @@
1292	1331	else
1293	1332	afm_ctrl &= ~ISP3X_RAWAF_EN;
1294	1333
1295		- isp3_param_write(params_vdev, afm_ctrl, ISP3X_RAWAF_CTRL);
	1334	+ isp3_param_write(params_vdev, afm_ctrl, ISP3X_RAWAF_CTRL, id);
1296	1335	if (params_vdev->afaemode_en) {
1297		- isp_rawae_enable_foraf(params_vdev, en);
	1336	+ isp_rawae_enable_foraf(params_vdev, en, id);
1298	1337	if (!en)
1299	1338	params_vdev->afaemode_en = false;
1300	1339	}
..	..	@@ -1302,78 +1341,78 @@
1302	1341
1303	1342	static void
1304	1343	isp_rawaelite_config(struct rkisp_isp_params_vdev *params_vdev,
1305		- const struct isp2x_rawaelite_meas_cfg *arg)
	1344	+ const struct isp2x_rawaelite_meas_cfg *arg, u32 id)
1306	1345	{
1307	1346	struct rkisp_device *ispdev = params_vdev->dev;
1308	1347	struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
1309		- u32 width = out_crop->width;
	1348	+ u32 width = out_crop->width, height = out_crop->height;
	1349	+ u32 h_size, v_size, h_offs, v_offs;
1310	1350	u32 block_hsize, block_vsize, value;
1311	1351	u32 wnd_num_idx = 0;
1312	1352	const u32 ae_wnd_num[] = {1, 5};
1313	1353
1314		- value = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL);
	1354	+ value = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL, id);
1315	1355	value &= ~(ISP3X_RAWAE_LITE_WNDNUM);
1316	1356	if (arg->wnd_num) {
1317	1357	value \|= ISP3X_RAWAE_LITE_WNDNUM;
1318	1358	wnd_num_idx = 1;
1319	1359	}
1320	1360	value &= ~ISP32_REG_WR_MASK;
1321		- isp3_param_write(params_vdev, value, ISP3X_RAWAE_LITE_CTRL);
	1361	+ isp3_param_write(params_vdev, value, ISP3X_RAWAE_LITE_CTRL, id);
1322	1362
	1363	+ h_offs = arg->win.h_offs & ~0x1;
	1364	+ v_offs = arg->win.v_offs & ~0x1;
1323	1365	isp3_param_write(params_vdev,
1324		- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
1325		- ISP3X_RAWAE_LITE_OFFSET);
	1366	+ ISP_PACK_2SHORT(h_offs, v_offs),
	1367	+ ISP3X_RAWAE_LITE_OFFSET, id);
1326	1368
1327		- block_hsize = arg->win.h_size / ae_wnd_num[wnd_num_idx];
1328		- value = block_hsize * ae_wnd_num[wnd_num_idx] + arg->win.h_offs;
1329		- if (ispdev->hw_dev->is_unite)
	1369	+ if (ispdev->hw_dev->unite)
1330	1370	width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
1331		- if (value + 1 > width)
1332		- block_hsize -= 1;
1333		- block_vsize = arg->win.v_size / ae_wnd_num[wnd_num_idx];
1334		- value = block_vsize * ae_wnd_num[wnd_num_idx] + arg->win.v_offs;
1335		- if (value + 2 > out_crop->height)
1336		- block_vsize -= 1;
1337		- if (block_vsize % 2)
1338		- block_vsize -= 1;
	1371	+ h_size = arg->win.h_size;
	1372	+ v_size = arg->win.v_size;
	1373	+ if (!h_size \|\| h_size + h_offs + 1 > width)
	1374	+ h_size = width - h_offs - 1;
	1375	+ if (!v_size \|\| v_size + v_offs + 2 > height)
	1376	+ v_size = height - v_offs - 2;
	1377	+ block_hsize = (h_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
	1378	+ block_vsize = (v_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
1339	1379	isp3_param_write(params_vdev,
1340	1380	ISP_PACK_2SHORT(block_hsize, block_vsize),
1341		- ISP3X_RAWAE_LITE_BLK_SIZ);
	1381	+ ISP3X_RAWAE_LITE_BLK_SIZ, id);
1342	1382
1343		- value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
	1383	+ value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
1344	1384	if ((value & ISP3X_RAWAE012_SEL(3)) != ISP3X_RAWAE012_SEL(arg->rawae_sel)) {
1345	1385	value &= ~(ISP3X_RAWAE012_SEL(3));
1346	1386	value \|= ISP3X_RAWAE012_SEL(arg->rawae_sel);
1347		- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
	1387	+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
1348	1388	}
1349	1389	}
1350	1390
1351	1391	static void
1352		-isp_rawaelite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1392	+isp_rawaelite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1353	1393	{
1354	1394	u32 exp_ctrl;
1355	1395
1356		- exp_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL);
	1396	+ exp_ctrl = isp3_param_read(params_vdev, ISP3X_RAWAE_LITE_CTRL, id);
1357	1397	exp_ctrl &= ~ISP32_REG_WR_MASK;
1358	1398	if (en)
1359	1399	exp_ctrl \|= ISP3X_RAWAE_LITE_EN;
1360	1400	else
1361	1401	exp_ctrl &= ~ISP3X_RAWAE_LITE_EN;
1362	1402
1363		- isp3_param_write(params_vdev, exp_ctrl, ISP3X_RAWAE_LITE_CTRL);
	1403	+ isp3_param_write(params_vdev, exp_ctrl, ISP3X_RAWAE_LITE_CTRL, id);
1364	1404	}
1365	1405
1366	1406	static void
1367	1407	isp_rawaebig_config(struct rkisp_isp_params_vdev *params_vdev,
1368	1408	const struct isp2x_rawaebig_meas_cfg *arg,
1369		- u32 blk_no)
	1409	+ u32 blk_no, u32 id)
1370	1410	{
1371	1411	struct rkisp_device *ispdev = params_vdev->dev;
1372	1412	struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
1373		- u32 width = out_crop->width;
1374		- u32 block_hsize, block_vsize;
1375		- u32 addr, i, value, h_size, v_size;
1376		- u32 wnd_num_idx = 0;
	1413	+ u32 width = out_crop->width, height = out_crop->height;
	1414	+ u32 addr, i, value, h_size, v_size, h_offs, v_offs;
	1415	+ u32 block_hsize, block_vsize, wnd_num_idx = 0;
1377	1416	const u32 ae_wnd_num[] = {
1378	1417	1, 5, 15, 15
1379	1418	};
..	..	@@ -1392,7 +1431,7 @@
1392	1431	}
1393	1432
1394	1433	/* avoid to override the old enable value */
1395		- value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
	1434	+ value = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
1396	1435	value &= ISP3X_RAWAE_BIG_EN;
1397	1436
1398	1437	wnd_num_idx = arg->wnd_num;
..	..	@@ -1408,59 +1447,65 @@
1408	1447	if (arg->subwin_en[3])
1409	1448	value \|= ISP3X_RAWAE_BIG_WND4_EN;
1410	1449	}
1411		- isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL);
	1450	+ isp3_param_write(params_vdev, value, addr + ISP3X_RAWAE_BIG_CTRL, id);
1412	1451
	1452	+ h_offs = arg->win.h_offs & ~0x1;
	1453	+ v_offs = arg->win.v_offs & ~0x1;
1413	1454	isp3_param_write(params_vdev,
1414		- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
1415		- addr + ISP3X_RAWAE_BIG_OFFSET);
	1455	+ ISP_PACK_2SHORT(h_offs, v_offs),
	1456	+ addr + ISP3X_RAWAE_BIG_OFFSET, id);
1416	1457
1417		- block_hsize = arg->win.h_size / ae_wnd_num[wnd_num_idx];
1418		- value = block_hsize * ae_wnd_num[wnd_num_idx] + arg->win.h_offs;
1419		- if (ispdev->hw_dev->is_unite)
	1458	+ if (ispdev->hw_dev->unite)
1420	1459	width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
1421		- if (value + 1 > width)
1422		- block_hsize -= 1;
1423		- block_vsize = arg->win.v_size / ae_wnd_num[wnd_num_idx];
1424		- value = block_vsize * ae_wnd_num[wnd_num_idx] + arg->win.v_offs;
1425		- if (value + 2 > out_crop->height)
1426		- block_vsize -= 1;
1427		- if (block_vsize % 2)
1428		- block_vsize -= 1;
	1460	+ h_size = arg->win.h_size;
	1461	+ v_size = arg->win.v_size;
	1462	+ if (!h_size \|\| h_size + h_offs + 1 > width)
	1463	+ h_size = width - h_offs - 1;
	1464	+ if (!v_size \|\| v_size + v_offs + 2 > height)
	1465	+ v_size = height - v_offs - 2;
	1466	+ block_hsize = (h_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
	1467	+ block_vsize = (v_size / ae_wnd_num[wnd_num_idx]) & ~0x1;
1429	1468	isp3_param_write(params_vdev,
1430	1469	ISP_PACK_2SHORT(block_hsize, block_vsize),
1431		- addr + ISP3X_RAWAE_BIG_BLK_SIZE);
	1470	+ addr + ISP3X_RAWAE_BIG_BLK_SIZE, id);
1432	1471
1433	1472	for (i = 0; i < ISP32_RAWAEBIG_SUBWIN_NUM; i++) {
1434		- isp3_param_write(params_vdev,
1435		- ISP_PACK_2SHORT(arg->subwin[i].h_offs, arg->subwin[i].v_offs),
1436		- addr + ISP3X_RAWAE_BIG_WND1_OFFSET + 8 * i);
	1473	+ h_offs = arg->subwin[i].h_offs & ~0x1;
	1474	+ v_offs = arg->subwin[i].v_offs & ~0x1;
	1475	+ isp3_param_write(params_vdev, ISP_PACK_2SHORT(h_offs, v_offs),
	1476	+ addr + ISP3X_RAWAE_BIG_WND1_OFFSET + 8 * i, id);
1437	1477
1438		- v_size = arg->subwin[i].v_size + arg->subwin[i].v_offs;
1439		- h_size = arg->subwin[i].h_size + arg->subwin[i].h_offs;
1440		- isp3_param_write(params_vdev,
1441		- ISP_PACK_2SHORT(h_size, v_size),
1442		- addr + ISP3X_RAWAE_BIG_WND1_SIZE + 8 * i);
	1478	+ v_size = arg->subwin[i].v_size;
	1479	+ h_size = arg->subwin[i].h_size;
	1480	+ if (!h_size \|\| h_size + h_offs > width)
	1481	+ h_size = width - h_offs;
	1482	+ if (!v_size \|\| v_size + v_offs > height)
	1483	+ v_size = height - v_offs;
	1484	+ h_size = (h_size + h_offs) & ~0x1;
	1485	+ v_size = (v_size + v_offs) & ~0x1;
	1486	+ isp3_param_write(params_vdev, ISP_PACK_2SHORT(h_size, v_size),
	1487	+ addr + ISP3X_RAWAE_BIG_WND1_SIZE + 8 * i, id);
1443	1488	}
1444	1489
1445		- value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
	1490	+ value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
1446	1491	if (blk_no == 0) {
1447	1492	if ((value & ISP3X_RAWAE3_SEL(3)) != ISP3X_RAWAE3_SEL(arg->rawae_sel)) {
1448	1493	value &= ~(ISP3X_RAWAE3_SEL(3));
1449	1494	value \|= ISP3X_RAWAE3_SEL(arg->rawae_sel);
1450		- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
	1495	+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
1451	1496	}
1452	1497	} else {
1453	1498	if ((value & ISP3X_RAWAE012_SEL(3)) != ISP3X_RAWAE012_SEL(arg->rawae_sel)) {
1454	1499	value &= ~(ISP3X_RAWAE012_SEL(3));
1455	1500	value \|= ISP3X_RAWAE012_SEL(arg->rawae_sel);
1456		- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
	1501	+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
1457	1502	}
1458	1503	}
1459	1504	}
1460	1505
1461	1506	static void
1462	1507	isp_rawaebig_enable(struct rkisp_isp_params_vdev *params_vdev,
1463		- bool en, u32 blk_no)
	1508	+ bool en, u32 blk_no, u32 id)
1464	1509	{
1465	1510	u32 exp_ctrl;
1466	1511	u32 addr;
..	..	@@ -1478,117 +1523,120 @@
1478	1523	break;
1479	1524	}
1480	1525
1481		- exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL);
	1526	+ exp_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWAE_BIG_CTRL, id);
1482	1527	exp_ctrl &= ~ISP32_REG_WR_MASK;
1483	1528	if (en)
1484	1529	exp_ctrl \|= ISP32_MODULE_EN;
1485	1530	else
1486	1531	exp_ctrl &= ~ISP32_MODULE_EN;
1487	1532
1488		- isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL);
	1533	+ isp3_param_write(params_vdev, exp_ctrl, addr + ISP3X_RAWAE_BIG_CTRL, id);
1489	1534	}
1490	1535
1491	1536	static void
1492	1537	isp_rawae1_config(struct rkisp_isp_params_vdev *params_vdev,
1493		- const struct isp2x_rawaebig_meas_cfg *arg)
	1538	+ const struct isp2x_rawaebig_meas_cfg *arg, u32 id)
1494	1539	{
1495		- isp_rawaebig_config(params_vdev, arg, 1);
	1540	+ isp_rawaebig_config(params_vdev, arg, 1, id);
1496	1541	}
1497	1542
1498	1543	static void
1499		-isp_rawae1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1544	+isp_rawae1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1500	1545	{
1501		- isp_rawaebig_enable(params_vdev, en, 1);
	1546	+ isp_rawaebig_enable(params_vdev, en, 1, id);
1502	1547	}
1503	1548
1504	1549	static void
1505	1550	isp_rawae2_config(struct rkisp_isp_params_vdev *params_vdev,
1506		- const struct isp2x_rawaebig_meas_cfg *arg)
	1551	+ const struct isp2x_rawaebig_meas_cfg *arg, u32 id)
1507	1552	{
1508		- isp_rawaebig_config(params_vdev, arg, 2);
	1553	+ isp_rawaebig_config(params_vdev, arg, 2, id);
1509	1554	}
1510	1555
1511	1556	static void
1512		-isp_rawae2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1557	+isp_rawae2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1513	1558	{
1514		- isp_rawaebig_enable(params_vdev, en, 2);
	1559	+ isp_rawaebig_enable(params_vdev, en, 2, id);
1515	1560	}
1516	1561
1517	1562	static void
1518	1563	isp_rawae3_config(struct rkisp_isp_params_vdev *params_vdev,
1519		- const struct isp2x_rawaebig_meas_cfg *arg)
	1564	+ const struct isp2x_rawaebig_meas_cfg *arg, u32 id)
1520	1565	{
1521		- isp_rawaebig_config(params_vdev, arg, 0);
	1566	+ isp_rawaebig_config(params_vdev, arg, 0, id);
1522	1567	}
1523	1568
1524	1569	static void
1525		-isp_rawae3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	1570	+isp_rawae3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
1526	1571	{
1527		- isp_rawaebig_enable(params_vdev, en, 0);
	1572	+ isp_rawaebig_enable(params_vdev, en, 0, id);
1528	1573	}
1529	1574
1530	1575	static void
1531	1576	isp_rawawb_cfg_sram(struct rkisp_isp_params_vdev *params_vdev,
1532		- const struct isp32_rawawb_meas_cfg *arg, bool is_check)
	1577	+ const struct isp32_rawawb_meas_cfg *arg, bool is_check, u32 id)
1533	1578	{
1534	1579	u32 i, val = ISP32_MODULE_EN;
1535	1580
1536	1581	if (params_vdev->dev->isp_ver == ISP_V32 && is_check &&
1537		- !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL) & val))
	1582	+ !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL, id) & val))
1538	1583	return;
1539	1584
1540	1585	for (i = 0; i < ISP32_RAWAWB_WEIGHT_NUM / 5; i++) {
1541		- isp3_param_write(params_vdev,
1542		- (arg->wp_blk_wei_w[5 * i] & 0x3f) \|
1543		- (arg->wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 \|
1544		- (arg->wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 \|
1545		- (arg->wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 \|
1546		- (arg->wp_blk_wei_w[5 * i + 4] & 0x3f) << 24,
1547		- ISP3X_RAWAWB_WRAM_DATA_BASE);
	1586	+ isp3_param_write_direct(params_vdev,
	1587	+ (arg->wp_blk_wei_w[5 * i] & 0x3f) \|
	1588	+ (arg->wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 \|
	1589	+ (arg->wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 \|
	1590	+ (arg->wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 \|
	1591	+ (arg->wp_blk_wei_w[5 * i + 4] & 0x3f) << 24,
	1592	+ ISP3X_RAWAWB_WRAM_DATA_BASE);
1548	1593	}
1549	1594	}
1550	1595
1551	1596	static void
1552	1597	isp_rawawb_config(struct rkisp_isp_params_vdev *params_vdev,
1553		- const struct isp32_rawawb_meas_cfg *arg)
	1598	+ const struct isp32_rawawb_meas_cfg *arg, u32 id)
1554	1599	{
1555		- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
	1600	+ struct rkisp_device *dev = params_vdev->dev;
	1601	+ struct v4l2_rect *out_crop = &dev->isp_sdev.out_crop;
	1602	+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
1556	1603	struct isp32_rawawb_meas_cfg *arg_rec = &params_rec->meas.rawawb;
1557	1604	const struct isp2x_bls_fixed_val *pval = &arg->bls2_val;
1558		- u32 value, val, mask, i;
	1605	+ u32 width = out_crop->width, height = out_crop->height;
	1606	+ u32 value, val, mask, i, h_size, v_size, h_offs, v_offs;
1559	1607
1560		- value = isp3_param_read(params_vdev, ISP3X_BLS_CTRL);
	1608	+ value = isp3_param_read(params_vdev, ISP3X_BLS_CTRL, id);
1561	1609	value &= ~ISP32_BLS_BLS2_EN;
1562	1610	if (arg->bls2_en) {
1563	1611	switch (params_vdev->raw_type) {
1564	1612	case RAW_BGGR:
1565		- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_D_FIXED);
1566		- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_C_FIXED);
1567		- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_B_FIXED);
1568		- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_A_FIXED);
	1613	+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_D_FIXED, id);
	1614	+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_C_FIXED, id);
	1615	+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_B_FIXED, id);
	1616	+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_A_FIXED, id);
1569	1617	break;
1570	1618	case RAW_GBRG:
1571		- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_C_FIXED);
1572		- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_D_FIXED);
1573		- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_A_FIXED);
1574		- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_B_FIXED);
	1619	+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_C_FIXED, id);
	1620	+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_D_FIXED, id);
	1621	+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_A_FIXED, id);
	1622	+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_B_FIXED, id);
1575	1623	break;
1576	1624	case RAW_GRBG:
1577		- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_B_FIXED);
1578		- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_A_FIXED);
1579		- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_D_FIXED);
1580		- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_C_FIXED);
	1625	+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_B_FIXED, id);
	1626	+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_A_FIXED, id);
	1627	+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_D_FIXED, id);
	1628	+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_C_FIXED, id);
1581	1629	break;
1582	1630	case RAW_RGGB:
1583	1631	default:
1584		- isp3_param_write(params_vdev, pval->r, ISP32_BLS2_A_FIXED);
1585		- isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_B_FIXED);
1586		- isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_C_FIXED);
1587		- isp3_param_write(params_vdev, pval->b, ISP32_BLS2_D_FIXED);
	1632	+ isp3_param_write(params_vdev, pval->r, ISP32_BLS2_A_FIXED, id);
	1633	+ isp3_param_write(params_vdev, pval->gr, ISP32_BLS2_B_FIXED, id);
	1634	+ isp3_param_write(params_vdev, pval->gb, ISP32_BLS2_C_FIXED, id);
	1635	+ isp3_param_write(params_vdev, pval->b, ISP32_BLS2_D_FIXED, id);
1588	1636	}
1589	1637	value \|= ISP32_BLS_BLS2_EN;
1590	1638	}
1591		- isp3_param_write(params_vdev, value, ISP3X_BLS_CTRL);
	1639	+ isp3_param_write(params_vdev, value, ISP3X_BLS_CTRL, id);
1592	1640
1593	1641	value = arg->in_overexposure_threshold << 16 \|
1594	1642	!!arg->blk_with_luma_wei_en << 8 \|
..	..	@@ -1599,463 +1647,473 @@
1599	1647	!!arg->blk_measure_enable;
1600	1648	if (params_vdev->dev->isp_ver == ISP_V32_L)
1601	1649	value \|= !!arg->ds16x8_mode_en << 7;
1602		- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_BLK_CTRL);
	1650	+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_BLK_CTRL, id);
1603	1651
1604		- isp3_param_write(params_vdev,
1605		- ISP_PACK_2SHORT(arg->h_offs, arg->v_offs),
1606		- ISP3X_RAWAWB_WIN_OFFS);
1607	1652
	1653	+ h_offs = arg->h_offs & ~0x1;
	1654	+ v_offs = arg->v_offs & ~0x1;
1608	1655	isp3_param_write(params_vdev,
1609		- ISP_PACK_2SHORT(arg->h_size, arg->v_size),
1610		- ISP3X_RAWAWB_WIN_SIZE);
	1656	+ ISP_PACK_2SHORT(h_offs, v_offs),
	1657	+ ISP3X_RAWAWB_WIN_OFFS, id);
	1658	+
	1659	+ if (dev->hw_dev->unite)
	1660	+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
	1661	+ h_size = arg->h_size;
	1662	+ v_size = arg->v_size;
	1663	+ if (!h_size \|\| h_size + h_offs > width)
	1664	+ h_size = width - h_offs;
	1665	+ if (!v_size \|\| v_size + v_offs > height)
	1666	+ v_size = height - v_offs;
	1667	+ isp3_param_write(params_vdev,
	1668	+ ISP_PACK_2SHORT(h_size, v_size),
	1669	+ ISP3X_RAWAWB_WIN_SIZE, id);
1611	1670
1612	1671	isp3_param_write(params_vdev,
1613	1672	ISP_PACK_2SHORT(arg->r_max, arg->g_max),
1614		- ISP3X_RAWAWB_LIMIT_RG_MAX);
	1673	+ ISP3X_RAWAWB_LIMIT_RG_MAX, id);
1615	1674
1616	1675	isp3_param_write(params_vdev,
1617	1676	ISP_PACK_2SHORT(arg->b_max, arg->y_max),
1618		- ISP3X_RAWAWB_LIMIT_BY_MAX);
	1677	+ ISP3X_RAWAWB_LIMIT_BY_MAX, id);
1619	1678
1620	1679	isp3_param_write(params_vdev,
1621	1680	ISP_PACK_2SHORT(arg->r_min, arg->g_min),
1622		- ISP3X_RAWAWB_LIMIT_RG_MIN);
	1681	+ ISP3X_RAWAWB_LIMIT_RG_MIN, id);
1623	1682
1624	1683	isp3_param_write(params_vdev,
1625	1684	ISP_PACK_2SHORT(arg->b_min, arg->y_min),
1626		- ISP3X_RAWAWB_LIMIT_BY_MIN);
	1685	+ ISP3X_RAWAWB_LIMIT_BY_MIN, id);
1627	1686
1628	1687	value = !!arg->wp_hist_xytype << 4 \|
1629	1688	!!arg->wp_blk_wei_en1 << 3 \|
1630	1689	!!arg->wp_blk_wei_en0 << 2 \|
1631	1690	!!arg->wp_luma_wei_en1 << 1 \|
1632	1691	!!arg->wp_luma_wei_en0;
1633		- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_WEIGHT_CURVE_CTRL);
	1692	+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_WEIGHT_CURVE_CTRL, id);
1634	1693
1635	1694	isp3_param_write(params_vdev,
1636	1695	ISP_PACK_4BYTE(arg->wp_luma_weicurve_y0,
1637	1696	arg->wp_luma_weicurve_y1,
1638	1697	arg->wp_luma_weicurve_y2,
1639	1698	arg->wp_luma_weicurve_y3),
1640		- ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR03);
	1699	+ ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR03, id);
1641	1700
1642	1701	isp3_param_write(params_vdev,
1643	1702	ISP_PACK_4BYTE(arg->wp_luma_weicurve_y4,
1644	1703	arg->wp_luma_weicurve_y5,
1645	1704	arg->wp_luma_weicurve_y6,
1646	1705	arg->wp_luma_weicurve_y7),
1647		- ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR47);
	1706	+ ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR47, id);
1648	1707
1649	1708	isp3_param_write(params_vdev,
1650	1709	arg->wp_luma_weicurve_y8,
1651		- ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR8);
	1710	+ ISP3X_RAWAWB_YWEIGHT_CURVE_XCOOR8, id);
1652	1711
1653	1712	isp3_param_write(params_vdev,
1654	1713	ISP_PACK_4BYTE(arg->wp_luma_weicurve_w0,
1655	1714	arg->wp_luma_weicurve_w1,
1656	1715	arg->wp_luma_weicurve_w2,
1657	1716	arg->wp_luma_weicurve_w3),
1658		- ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR03);
	1717	+ ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR03, id);
1659	1718
1660	1719	isp3_param_write(params_vdev,
1661	1720	ISP_PACK_4BYTE(arg->wp_luma_weicurve_w4,
1662	1721	arg->wp_luma_weicurve_w5,
1663	1722	arg->wp_luma_weicurve_w6,
1664	1723	arg->wp_luma_weicurve_w7),
1665		- ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR47);
	1724	+ ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR47, id);
1666	1725
1667	1726	isp3_param_write(params_vdev,
1668	1727	ISP_PACK_2SHORT(arg->wp_luma_weicurve_w8,
1669	1728	arg->pre_wbgain_inv_r),
1670		- ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR8);
	1729	+ ISP3X_RAWAWB_YWEIGHT_CURVE_YCOOR8, id);
1671	1730
1672	1731	isp3_param_write(params_vdev,
1673	1732	ISP_PACK_2SHORT(arg->pre_wbgain_inv_g,
1674	1733	arg->pre_wbgain_inv_b),
1675		- ISP3X_RAWAWB_PRE_WBGAIN_INV);
	1734	+ ISP3X_RAWAWB_PRE_WBGAIN_INV, id);
1676	1735
1677	1736	isp3_param_write(params_vdev,
1678	1737	ISP_PACK_2SHORT(arg->vertex0_u_0, arg->vertex0_v_0),
1679		- ISP3X_RAWAWB_UV_DETC_VERTEX0_0);
	1738	+ ISP3X_RAWAWB_UV_DETC_VERTEX0_0, id);
1680	1739
1681	1740	isp3_param_write(params_vdev,
1682	1741	ISP_PACK_2SHORT(arg->vertex1_u_0, arg->vertex1_v_0),
1683		- ISP3X_RAWAWB_UV_DETC_VERTEX1_0);
	1742	+ ISP3X_RAWAWB_UV_DETC_VERTEX1_0, id);
1684	1743
1685	1744	isp3_param_write(params_vdev,
1686	1745	ISP_PACK_2SHORT(arg->vertex2_u_0, arg->vertex2_v_0),
1687		- ISP3X_RAWAWB_UV_DETC_VERTEX2_0);
	1746	+ ISP3X_RAWAWB_UV_DETC_VERTEX2_0, id);
1688	1747
1689	1748	isp3_param_write(params_vdev,
1690	1749	ISP_PACK_2SHORT(arg->vertex3_u_0, arg->vertex3_v_0),
1691		- ISP3X_RAWAWB_UV_DETC_VERTEX3_0);
	1750	+ ISP3X_RAWAWB_UV_DETC_VERTEX3_0, id);
1692	1751
1693	1752	isp3_param_write(params_vdev, arg->islope01_0,
1694		- ISP3X_RAWAWB_UV_DETC_ISLOPE01_0);
	1753	+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_0, id);
1695	1754
1696	1755	isp3_param_write(params_vdev, arg->islope12_0,
1697		- ISP3X_RAWAWB_UV_DETC_ISLOPE12_0);
	1756	+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_0, id);
1698	1757
1699	1758	isp3_param_write(params_vdev, arg->islope23_0,
1700		- ISP3X_RAWAWB_UV_DETC_ISLOPE23_0);
	1759	+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_0, id);
1701	1760
1702	1761	isp3_param_write(params_vdev, arg->islope30_0,
1703		- ISP3X_RAWAWB_UV_DETC_ISLOPE30_0);
	1762	+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_0, id);
1704	1763
1705	1764	isp3_param_write(params_vdev,
1706	1765	ISP_PACK_2SHORT(arg->vertex0_u_1,
1707	1766	arg->vertex0_v_1),
1708		- ISP3X_RAWAWB_UV_DETC_VERTEX0_1);
	1767	+ ISP3X_RAWAWB_UV_DETC_VERTEX0_1, id);
1709	1768
1710	1769	isp3_param_write(params_vdev,
1711	1770	ISP_PACK_2SHORT(arg->vertex1_u_1,
1712	1771	arg->vertex1_v_1),
1713		- ISP3X_RAWAWB_UV_DETC_VERTEX1_1);
	1772	+ ISP3X_RAWAWB_UV_DETC_VERTEX1_1, id);
1714	1773
1715	1774	isp3_param_write(params_vdev,
1716	1775	ISP_PACK_2SHORT(arg->vertex2_u_1,
1717	1776	arg->vertex2_v_1),
1718		- ISP3X_RAWAWB_UV_DETC_VERTEX2_1);
	1777	+ ISP3X_RAWAWB_UV_DETC_VERTEX2_1, id);
1719	1778
1720	1779	isp3_param_write(params_vdev,
1721	1780	ISP_PACK_2SHORT(arg->vertex3_u_1,
1722	1781	arg->vertex3_v_1),
1723		- ISP3X_RAWAWB_UV_DETC_VERTEX3_1);
	1782	+ ISP3X_RAWAWB_UV_DETC_VERTEX3_1, id);
1724	1783
1725	1784	isp3_param_write(params_vdev, arg->islope01_1,
1726		- ISP3X_RAWAWB_UV_DETC_ISLOPE01_1);
	1785	+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_1, id);
1727	1786
1728	1787	isp3_param_write(params_vdev, arg->islope12_1,
1729		- ISP3X_RAWAWB_UV_DETC_ISLOPE12_1);
	1788	+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_1, id);
1730	1789
1731	1790	isp3_param_write(params_vdev, arg->islope23_1,
1732		- ISP3X_RAWAWB_UV_DETC_ISLOPE23_1);
	1791	+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_1, id);
1733	1792
1734	1793	isp3_param_write(params_vdev, arg->islope30_1,
1735		- ISP3X_RAWAWB_UV_DETC_ISLOPE30_1);
	1794	+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_1, id);
1736	1795
1737	1796	isp3_param_write(params_vdev,
1738	1797	ISP_PACK_2SHORT(arg->vertex0_u_2,
1739	1798	arg->vertex0_v_2),
1740		- ISP3X_RAWAWB_UV_DETC_VERTEX0_2);
	1799	+ ISP3X_RAWAWB_UV_DETC_VERTEX0_2, id);
1741	1800
1742	1801	isp3_param_write(params_vdev,
1743	1802	ISP_PACK_2SHORT(arg->vertex1_u_2,
1744	1803	arg->vertex1_v_2),
1745		- ISP3X_RAWAWB_UV_DETC_VERTEX1_2);
	1804	+ ISP3X_RAWAWB_UV_DETC_VERTEX1_2, id);
1746	1805
1747	1806	isp3_param_write(params_vdev,
1748	1807	ISP_PACK_2SHORT(arg->vertex2_u_2,
1749	1808	arg->vertex2_v_2),
1750		- ISP3X_RAWAWB_UV_DETC_VERTEX2_2);
	1809	+ ISP3X_RAWAWB_UV_DETC_VERTEX2_2, id);
1751	1810
1752	1811	isp3_param_write(params_vdev,
1753	1812	ISP_PACK_2SHORT(arg->vertex3_u_2,
1754	1813	arg->vertex3_v_2),
1755		- ISP3X_RAWAWB_UV_DETC_VERTEX3_2);
	1814	+ ISP3X_RAWAWB_UV_DETC_VERTEX3_2, id);
1756	1815
1757	1816	isp3_param_write(params_vdev, arg->islope01_2,
1758		- ISP3X_RAWAWB_UV_DETC_ISLOPE01_2);
	1817	+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_2, id);
1759	1818
1760	1819	isp3_param_write(params_vdev, arg->islope12_2,
1761		- ISP3X_RAWAWB_UV_DETC_ISLOPE12_2);
	1820	+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_2, id);
1762	1821
1763	1822	isp3_param_write(params_vdev, arg->islope23_2,
1764		- ISP3X_RAWAWB_UV_DETC_ISLOPE23_2);
	1823	+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_2, id);
1765	1824
1766	1825	isp3_param_write(params_vdev, arg->islope30_2,
1767		- ISP3X_RAWAWB_UV_DETC_ISLOPE30_2);
	1826	+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_2, id);
1768	1827
1769	1828	isp3_param_write(params_vdev,
1770	1829	ISP_PACK_2SHORT(arg->vertex0_u_3,
1771	1830	arg->vertex0_v_3),
1772		- ISP3X_RAWAWB_UV_DETC_VERTEX0_3);
	1831	+ ISP3X_RAWAWB_UV_DETC_VERTEX0_3, id);
1773	1832
1774	1833	isp3_param_write(params_vdev,
1775	1834	ISP_PACK_2SHORT(arg->vertex1_u_3,
1776	1835	arg->vertex1_v_3),
1777		- ISP3X_RAWAWB_UV_DETC_VERTEX1_3);
	1836	+ ISP3X_RAWAWB_UV_DETC_VERTEX1_3, id);
1778	1837
1779	1838	isp3_param_write(params_vdev,
1780	1839	ISP_PACK_2SHORT(arg->vertex2_u_3,
1781	1840	arg->vertex2_v_3),
1782		- ISP3X_RAWAWB_UV_DETC_VERTEX2_3);
	1841	+ ISP3X_RAWAWB_UV_DETC_VERTEX2_3, id);
1783	1842
1784	1843	isp3_param_write(params_vdev,
1785	1844	ISP_PACK_2SHORT(arg->vertex3_u_3,
1786	1845	arg->vertex3_v_3),
1787		- ISP3X_RAWAWB_UV_DETC_VERTEX3_3);
	1846	+ ISP3X_RAWAWB_UV_DETC_VERTEX3_3, id);
1788	1847
1789	1848	isp3_param_write(params_vdev, arg->islope01_3,
1790		- ISP3X_RAWAWB_UV_DETC_ISLOPE01_3);
	1849	+ ISP3X_RAWAWB_UV_DETC_ISLOPE01_3, id);
1791	1850
1792	1851	isp3_param_write(params_vdev, arg->islope12_3,
1793		- ISP3X_RAWAWB_UV_DETC_ISLOPE12_3);
	1852	+ ISP3X_RAWAWB_UV_DETC_ISLOPE12_3, id);
1794	1853
1795	1854	isp3_param_write(params_vdev, arg->islope23_3,
1796		- ISP3X_RAWAWB_UV_DETC_ISLOPE23_3);
	1855	+ ISP3X_RAWAWB_UV_DETC_ISLOPE23_3, id);
1797	1856
1798	1857	isp3_param_write(params_vdev, arg->islope30_3,
1799		- ISP3X_RAWAWB_UV_DETC_ISLOPE30_3);
	1858	+ ISP3X_RAWAWB_UV_DETC_ISLOPE30_3, id);
1800	1859
1801	1860	isp3_param_write(params_vdev,
1802	1861	ISP_PACK_2SHORT(arg->rgb2ryuvmat0_y,
1803	1862	arg->rgb2ryuvmat1_y),
1804		- ISP3X_RAWAWB_YUV_RGB2ROTY_0);
	1863	+ ISP3X_RAWAWB_YUV_RGB2ROTY_0, id);
1805	1864
1806	1865	isp3_param_write(params_vdev,
1807	1866	ISP_PACK_2SHORT(arg->rgb2ryuvmat2_y,
1808	1867	arg->rgb2ryuvofs_y),
1809		- ISP3X_RAWAWB_YUV_RGB2ROTY_1);
	1868	+ ISP3X_RAWAWB_YUV_RGB2ROTY_1, id);
1810	1869
1811	1870	isp3_param_write(params_vdev,
1812	1871	ISP_PACK_2SHORT(arg->rgb2ryuvmat0_u,
1813	1872	arg->rgb2ryuvmat1_u),
1814		- ISP3X_RAWAWB_YUV_RGB2ROTU_0);
	1873	+ ISP3X_RAWAWB_YUV_RGB2ROTU_0, id);
1815	1874
1816	1875
1817	1876	isp3_param_write(params_vdev,
1818	1877	ISP_PACK_2SHORT(arg->rgb2ryuvmat2_u,
1819	1878	arg->rgb2ryuvofs_u),
1820		- ISP3X_RAWAWB_YUV_RGB2ROTU_1);
	1879	+ ISP3X_RAWAWB_YUV_RGB2ROTU_1, id);
1821	1880
1822	1881	isp3_param_write(params_vdev,
1823	1882	ISP_PACK_2SHORT(arg->rgb2ryuvmat0_v,
1824	1883	arg->rgb2ryuvmat1_v),
1825		- ISP3X_RAWAWB_YUV_RGB2ROTV_0);
	1884	+ ISP3X_RAWAWB_YUV_RGB2ROTV_0, id);
1826	1885
1827	1886	isp3_param_write(params_vdev,
1828	1887	ISP_PACK_2SHORT(arg->rgb2ryuvmat2_v,
1829	1888	arg->rgb2ryuvofs_v),
1830		- ISP3X_RAWAWB_YUV_RGB2ROTV_1);
	1889	+ ISP3X_RAWAWB_YUV_RGB2ROTV_1, id);
1831	1890
1832	1891	isp3_param_write(params_vdev,
1833	1892	ISP_PACK_2SHORT(arg->coor_x1_ls0_y,
1834	1893	arg->vec_x21_ls0_y),
1835		- ISP3X_RAWAWB_YUV_X_COOR_Y_0);
	1894	+ ISP3X_RAWAWB_YUV_X_COOR_Y_0, id);
1836	1895
1837	1896	isp3_param_write(params_vdev,
1838	1897	ISP_PACK_2SHORT(arg->coor_x1_ls0_u,
1839	1898	arg->vec_x21_ls0_u),
1840		- ISP3X_RAWAWB_YUV_X_COOR_U_0);
	1899	+ ISP3X_RAWAWB_YUV_X_COOR_U_0, id);
1841	1900
1842	1901	isp3_param_write(params_vdev,
1843	1902	ISP_PACK_2SHORT(arg->coor_x1_ls0_v,
1844	1903	arg->vec_x21_ls0_v),
1845		- ISP3X_RAWAWB_YUV_X_COOR_V_0);
	1904	+ ISP3X_RAWAWB_YUV_X_COOR_V_0, id);
1846	1905
1847	1906	isp3_param_write(params_vdev,
1848	1907	ISP_PACK_4BYTE(arg->dis_x1x2_ls0, 0,
1849	1908	arg->rotu0_ls0, arg->rotu1_ls0),
1850		- ISP3X_RAWAWB_YUV_X1X2_DIS_0);
	1909	+ ISP3X_RAWAWB_YUV_X1X2_DIS_0, id);
1851	1910
1852	1911	isp3_param_write(params_vdev,
1853	1912	ISP_PACK_4BYTE(arg->rotu2_ls0, arg->rotu3_ls0,
1854	1913	arg->rotu4_ls0, arg->rotu5_ls0),
1855		- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_0);
	1914	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_0, id);
1856	1915
1857	1916	isp3_param_write(params_vdev,
1858	1917	ISP_PACK_2SHORT(arg->th0_ls0, arg->th1_ls0),
1859		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_0);
	1918	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_0, id);
1860	1919
1861	1920	isp3_param_write(params_vdev,
1862	1921	ISP_PACK_2SHORT(arg->th2_ls0, arg->th3_ls0),
1863		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_0);
	1922	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_0, id);
1864	1923
1865	1924	isp3_param_write(params_vdev,
1866	1925	ISP_PACK_2SHORT(arg->th4_ls0, arg->th5_ls0),
1867		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_0);
	1926	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_0, id);
1868	1927
1869	1928	isp3_param_write(params_vdev,
1870	1929	ISP_PACK_2SHORT(arg->coor_x1_ls1_y,
1871	1930	arg->vec_x21_ls1_y),
1872		- ISP3X_RAWAWB_YUV_X_COOR_Y_1);
	1931	+ ISP3X_RAWAWB_YUV_X_COOR_Y_1, id);
1873	1932
1874	1933	isp3_param_write(params_vdev,
1875	1934	ISP_PACK_2SHORT(arg->coor_x1_ls1_u,
1876	1935	arg->vec_x21_ls1_u),
1877		- ISP3X_RAWAWB_YUV_X_COOR_U_1);
	1936	+ ISP3X_RAWAWB_YUV_X_COOR_U_1, id);
1878	1937
1879	1938	isp3_param_write(params_vdev,
1880	1939	ISP_PACK_2SHORT(arg->coor_x1_ls1_v,
1881	1940	arg->vec_x21_ls1_v),
1882		- ISP3X_RAWAWB_YUV_X_COOR_V_1);
	1941	+ ISP3X_RAWAWB_YUV_X_COOR_V_1, id);
1883	1942
1884	1943	isp3_param_write(params_vdev,
1885	1944	ISP_PACK_4BYTE(arg->dis_x1x2_ls1, 0,
1886	1945	arg->rotu0_ls1, arg->rotu1_ls1),
1887		- ISP3X_RAWAWB_YUV_X1X2_DIS_1);
	1946	+ ISP3X_RAWAWB_YUV_X1X2_DIS_1, id);
1888	1947
1889	1948	isp3_param_write(params_vdev,
1890	1949	ISP_PACK_4BYTE(arg->rotu2_ls1, arg->rotu3_ls1,
1891	1950	arg->rotu4_ls1, arg->rotu5_ls1),
1892		- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_1);
	1951	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_1, id);
1893	1952
1894	1953	isp3_param_write(params_vdev,
1895	1954	ISP_PACK_2SHORT(arg->th0_ls1, arg->th1_ls1),
1896		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_1);
	1955	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_1, id);
1897	1956
1898	1957	isp3_param_write(params_vdev,
1899	1958	ISP_PACK_2SHORT(arg->th2_ls1, arg->th3_ls1),
1900		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_1);
	1959	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_1, id);
1901	1960
1902	1961	isp3_param_write(params_vdev,
1903	1962	ISP_PACK_2SHORT(arg->th4_ls1, arg->th5_ls1),
1904		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_1);
	1963	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_1, id);
1905	1964
1906	1965	isp3_param_write(params_vdev,
1907	1966	ISP_PACK_2SHORT(arg->coor_x1_ls2_y, arg->vec_x21_ls2_y),
1908		- ISP3X_RAWAWB_YUV_X_COOR_Y_2);
	1967	+ ISP3X_RAWAWB_YUV_X_COOR_Y_2, id);
1909	1968
1910	1969	isp3_param_write(params_vdev,
1911	1970	ISP_PACK_2SHORT(arg->coor_x1_ls2_u, arg->vec_x21_ls2_u),
1912		- ISP3X_RAWAWB_YUV_X_COOR_U_2);
	1971	+ ISP3X_RAWAWB_YUV_X_COOR_U_2, id);
1913	1972
1914	1973	isp3_param_write(params_vdev,
1915	1974	ISP_PACK_2SHORT(arg->coor_x1_ls2_v, arg->vec_x21_ls2_v),
1916		- ISP3X_RAWAWB_YUV_X_COOR_V_2);
	1975	+ ISP3X_RAWAWB_YUV_X_COOR_V_2, id);
1917	1976
1918	1977	isp3_param_write(params_vdev,
1919	1978	ISP_PACK_4BYTE(arg->dis_x1x2_ls2, 0,
1920	1979	arg->rotu0_ls2, arg->rotu1_ls2),
1921		- ISP3X_RAWAWB_YUV_X1X2_DIS_2);
	1980	+ ISP3X_RAWAWB_YUV_X1X2_DIS_2, id);
1922	1981
1923	1982	isp3_param_write(params_vdev,
1924	1983	ISP_PACK_4BYTE(arg->rotu2_ls2, arg->rotu3_ls2,
1925	1984	arg->rotu4_ls2, arg->rotu5_ls2),
1926		- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_2);
	1985	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_2, id);
1927	1986
1928	1987	isp3_param_write(params_vdev,
1929	1988	ISP_PACK_2SHORT(arg->th0_ls2, arg->th1_ls2),
1930		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_2);
	1989	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_2, id);
1931	1990
1932	1991	isp3_param_write(params_vdev,
1933	1992	ISP_PACK_2SHORT(arg->th2_ls2, arg->th3_ls2),
1934		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_2);
	1993	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_2, id);
1935	1994
1936	1995	isp3_param_write(params_vdev,
1937	1996	ISP_PACK_2SHORT(arg->th4_ls2, arg->th5_ls2),
1938		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_2);
	1997	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_2, id);
1939	1998
1940	1999	isp3_param_write(params_vdev,
1941	2000	ISP_PACK_2SHORT(arg->coor_x1_ls3_y,
1942	2001	arg->vec_x21_ls3_y),
1943		- ISP3X_RAWAWB_YUV_X_COOR_Y_3);
	2002	+ ISP3X_RAWAWB_YUV_X_COOR_Y_3, id);
1944	2003
1945	2004	isp3_param_write(params_vdev,
1946	2005	ISP_PACK_2SHORT(arg->coor_x1_ls3_u,
1947	2006	arg->vec_x21_ls3_u),
1948		- ISP3X_RAWAWB_YUV_X_COOR_U_3);
	2007	+ ISP3X_RAWAWB_YUV_X_COOR_U_3, id);
1949	2008
1950	2009	isp3_param_write(params_vdev,
1951	2010	ISP_PACK_2SHORT(arg->coor_x1_ls3_v,
1952	2011	arg->vec_x21_ls3_v),
1953		- ISP3X_RAWAWB_YUV_X_COOR_V_3);
	2012	+ ISP3X_RAWAWB_YUV_X_COOR_V_3, id);
1954	2013
1955	2014	isp3_param_write(params_vdev,
1956	2015	ISP_PACK_4BYTE(arg->dis_x1x2_ls3, 0,
1957	2016	arg->rotu0_ls3, arg->rotu1_ls3),
1958		- ISP3X_RAWAWB_YUV_X1X2_DIS_3);
	2017	+ ISP3X_RAWAWB_YUV_X1X2_DIS_3, id);
1959	2018
1960	2019	isp3_param_write(params_vdev,
1961	2020	ISP_PACK_4BYTE(arg->rotu2_ls3, arg->rotu3_ls3,
1962	2021	arg->rotu4_ls3, arg->rotu5_ls3),
1963		- ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_3);
	2022	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_UCOOR_3, id);
1964	2023
1965	2024	isp3_param_write(params_vdev,
1966	2025	ISP_PACK_2SHORT(arg->th0_ls3, arg->th1_ls3),
1967		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_3);
	2026	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH0_3, id);
1968	2027
1969	2028	isp3_param_write(params_vdev,
1970	2029	ISP_PACK_2SHORT(arg->th2_ls3, arg->th3_ls3),
1971		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_3);
	2030	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH1_3, id);
1972	2031
1973	2032	isp3_param_write(params_vdev,
1974	2033	ISP_PACK_2SHORT(arg->th4_ls3, arg->th5_ls3),
1975		- ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_3);
	2034	+ ISP3X_RAWAWB_YUV_INTERP_CURVE_TH2_3, id);
1976	2035
1977	2036	isp3_param_write(params_vdev,
1978	2037	ISP_PACK_2SHORT(arg->wt0, arg->wt1),
1979		- ISP3X_RAWAWB_RGB2XY_WT01);
	2038	+ ISP3X_RAWAWB_RGB2XY_WT01, id);
1980	2039
1981		- isp3_param_write(params_vdev, arg->wt2,
1982		- ISP3X_RAWAWB_RGB2XY_WT2);
	2040	+ isp3_param_write(params_vdev, arg->wt2, ISP3X_RAWAWB_RGB2XY_WT2, id);
1983	2041
1984	2042	isp3_param_write(params_vdev,
1985	2043	ISP_PACK_2SHORT(arg->mat0_x, arg->mat0_y),
1986		- ISP3X_RAWAWB_RGB2XY_MAT0_XY);
	2044	+ ISP3X_RAWAWB_RGB2XY_MAT0_XY, id);
1987	2045
1988	2046	isp3_param_write(params_vdev,
1989	2047	ISP_PACK_2SHORT(arg->mat1_x, arg->mat1_y),
1990		- ISP3X_RAWAWB_RGB2XY_MAT1_XY);
	2048	+ ISP3X_RAWAWB_RGB2XY_MAT1_XY, id);
1991	2049
1992	2050	isp3_param_write(params_vdev,
1993	2051	ISP_PACK_2SHORT(arg->mat2_x, arg->mat2_y),
1994		- ISP3X_RAWAWB_RGB2XY_MAT2_XY);
	2052	+ ISP3X_RAWAWB_RGB2XY_MAT2_XY, id);
1995	2053
1996	2054	isp3_param_write(params_vdev,
1997	2055	ISP_PACK_2SHORT(arg->nor_x0_0, arg->nor_x1_0),
1998		- ISP3X_RAWAWB_XY_DETC_NOR_X_0);
	2056	+ ISP3X_RAWAWB_XY_DETC_NOR_X_0, id);
1999	2057
2000	2058	isp3_param_write(params_vdev,
2001	2059	ISP_PACK_2SHORT(arg->nor_y0_0, arg->nor_y1_0),
2002		- ISP3X_RAWAWB_XY_DETC_NOR_Y_0);
	2060	+ ISP3X_RAWAWB_XY_DETC_NOR_Y_0, id);
2003	2061
2004	2062	isp3_param_write(params_vdev,
2005	2063	ISP_PACK_2SHORT(arg->big_x0_0, arg->big_x1_0),
2006		- ISP3X_RAWAWB_XY_DETC_BIG_X_0);
	2064	+ ISP3X_RAWAWB_XY_DETC_BIG_X_0, id);
2007	2065
2008	2066	isp3_param_write(params_vdev,
2009	2067	ISP_PACK_2SHORT(arg->big_y0_0, arg->big_y1_0),
2010		- ISP3X_RAWAWB_XY_DETC_BIG_Y_0);
	2068	+ ISP3X_RAWAWB_XY_DETC_BIG_Y_0, id);
2011	2069
2012	2070	isp3_param_write(params_vdev,
2013	2071	ISP_PACK_2SHORT(arg->nor_x0_1, arg->nor_x1_1),
2014		- ISP3X_RAWAWB_XY_DETC_NOR_X_1);
	2072	+ ISP3X_RAWAWB_XY_DETC_NOR_X_1, id);
2015	2073
2016	2074	isp3_param_write(params_vdev,
2017	2075	ISP_PACK_2SHORT(arg->nor_y0_1, arg->nor_y1_1),
2018		- ISP3X_RAWAWB_XY_DETC_NOR_Y_1);
	2076	+ ISP3X_RAWAWB_XY_DETC_NOR_Y_1, id);
2019	2077
2020	2078	isp3_param_write(params_vdev,
2021	2079	ISP_PACK_2SHORT(arg->big_x0_1, arg->big_x1_1),
2022		- ISP3X_RAWAWB_XY_DETC_BIG_X_1);
	2080	+ ISP3X_RAWAWB_XY_DETC_BIG_X_1, id);
2023	2081
2024	2082	isp3_param_write(params_vdev,
2025	2083	ISP_PACK_2SHORT(arg->big_y0_1, arg->big_y1_1),
2026		- ISP3X_RAWAWB_XY_DETC_BIG_Y_1);
	2084	+ ISP3X_RAWAWB_XY_DETC_BIG_Y_1, id);
2027	2085
2028	2086	isp3_param_write(params_vdev,
2029	2087	ISP_PACK_2SHORT(arg->nor_x0_2, arg->nor_x1_2),
2030		- ISP3X_RAWAWB_XY_DETC_NOR_X_2);
	2088	+ ISP3X_RAWAWB_XY_DETC_NOR_X_2, id);
2031	2089
2032	2090	isp3_param_write(params_vdev,
2033	2091	ISP_PACK_2SHORT(arg->nor_y0_2, arg->nor_y1_2),
2034		- ISP3X_RAWAWB_XY_DETC_NOR_Y_2);
	2092	+ ISP3X_RAWAWB_XY_DETC_NOR_Y_2, id);
2035	2093
2036	2094	isp3_param_write(params_vdev,
2037	2095	ISP_PACK_2SHORT(arg->big_x0_2, arg->big_x1_2),
2038		- ISP3X_RAWAWB_XY_DETC_BIG_X_2);
	2096	+ ISP3X_RAWAWB_XY_DETC_BIG_X_2, id);
2039	2097
2040	2098	isp3_param_write(params_vdev,
2041	2099	ISP_PACK_2SHORT(arg->big_y0_2, arg->big_y1_2),
2042		- ISP3X_RAWAWB_XY_DETC_BIG_Y_2);
	2100	+ ISP3X_RAWAWB_XY_DETC_BIG_Y_2, id);
2043	2101
2044	2102	isp3_param_write(params_vdev,
2045	2103	ISP_PACK_2SHORT(arg->nor_x0_3, arg->nor_x1_3),
2046		- ISP3X_RAWAWB_XY_DETC_NOR_X_3);
	2104	+ ISP3X_RAWAWB_XY_DETC_NOR_X_3, id);
2047	2105
2048	2106	isp3_param_write(params_vdev,
2049	2107	ISP_PACK_2SHORT(arg->nor_y0_3, arg->nor_y1_3),
2050		- ISP3X_RAWAWB_XY_DETC_NOR_Y_3);
	2108	+ ISP3X_RAWAWB_XY_DETC_NOR_Y_3, id);
2051	2109
2052	2110	isp3_param_write(params_vdev,
2053	2111	ISP_PACK_2SHORT(arg->big_x0_3, arg->big_x1_3),
2054		- ISP3X_RAWAWB_XY_DETC_BIG_X_3);
	2112	+ ISP3X_RAWAWB_XY_DETC_BIG_X_3, id);
2055	2113
2056	2114	isp3_param_write(params_vdev,
2057	2115	ISP_PACK_2SHORT(arg->big_y0_3, arg->big_y1_3),
2058		- ISP3X_RAWAWB_XY_DETC_BIG_Y_3);
	2116	+ ISP3X_RAWAWB_XY_DETC_BIG_Y_3, id);
2059	2117
2060	2118	value = (arg->exc_wp_region0_excen & 0x3) \|
2061	2119	!!arg->exc_wp_region0_measen << 2 \|
..	..	@@ -2076,138 +2134,138 @@
2076	2134	(arg->exc_wp_region6_excen & 0x3) << 24 \|
2077	2135	!!arg->exc_wp_region6_domain << 27 \|
2078	2136	!!arg->multiwindow_en << 31;
2079		- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_MULTIWINDOW_EXC_CTRL);
	2137	+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_MULTIWINDOW_EXC_CTRL, id);
2080	2138
2081	2139	isp3_param_write(params_vdev,
2082	2140	ISP_PACK_2SHORT(arg->multiwindow0_h_offs,
2083	2141	arg->multiwindow0_v_offs),
2084		- ISP3X_RAWAWB_MULTIWINDOW0_OFFS);
	2142	+ ISP3X_RAWAWB_MULTIWINDOW0_OFFS, id);
2085	2143	isp3_param_write(params_vdev,
2086	2144	ISP_PACK_2SHORT(arg->multiwindow0_h_size,
2087	2145	arg->multiwindow0_v_size),
2088		- ISP3X_RAWAWB_MULTIWINDOW0_SIZE);
	2146	+ ISP3X_RAWAWB_MULTIWINDOW0_SIZE, id);
2089	2147	isp3_param_write(params_vdev,
2090	2148	ISP_PACK_2SHORT(arg->multiwindow1_h_offs,
2091	2149	arg->multiwindow1_v_offs),
2092		- ISP3X_RAWAWB_MULTIWINDOW1_OFFS);
	2150	+ ISP3X_RAWAWB_MULTIWINDOW1_OFFS, id);
2093	2151	isp3_param_write(params_vdev,
2094	2152	ISP_PACK_2SHORT(arg->multiwindow1_h_size,
2095	2153	arg->multiwindow1_v_size),
2096		- ISP3X_RAWAWB_MULTIWINDOW1_SIZE);
	2154	+ ISP3X_RAWAWB_MULTIWINDOW1_SIZE, id);
2097	2155	isp3_param_write(params_vdev,
2098	2156	ISP_PACK_2SHORT(arg->multiwindow2_h_offs,
2099	2157	arg->multiwindow2_v_offs),
2100		- ISP3X_RAWAWB_MULTIWINDOW2_OFFS);
	2158	+ ISP3X_RAWAWB_MULTIWINDOW2_OFFS, id);
2101	2159	isp3_param_write(params_vdev,
2102	2160	ISP_PACK_2SHORT(arg->multiwindow2_h_size,
2103	2161	arg->multiwindow2_v_size),
2104		- ISP3X_RAWAWB_MULTIWINDOW2_SIZE);
	2162	+ ISP3X_RAWAWB_MULTIWINDOW2_SIZE, id);
2105	2163	isp3_param_write(params_vdev,
2106	2164	ISP_PACK_2SHORT(arg->multiwindow3_h_offs,
2107	2165	arg->multiwindow3_v_offs),
2108		- ISP3X_RAWAWB_MULTIWINDOW3_OFFS);
	2166	+ ISP3X_RAWAWB_MULTIWINDOW3_OFFS, id);
2109	2167	isp3_param_write(params_vdev,
2110	2168	ISP_PACK_2SHORT(arg->multiwindow3_h_size,
2111	2169	arg->multiwindow3_v_size),
2112		- ISP3X_RAWAWB_MULTIWINDOW3_SIZE);
	2170	+ ISP3X_RAWAWB_MULTIWINDOW3_SIZE, id);
2113	2171
2114	2172	isp3_param_write(params_vdev,
2115	2173	ISP_PACK_2SHORT(arg->exc_wp_region0_xu0,
2116	2174	arg->exc_wp_region0_xu1),
2117		- ISP3X_RAWAWB_EXC_WP_REGION0_XU);
	2175	+ ISP3X_RAWAWB_EXC_WP_REGION0_XU, id);
2118	2176
2119	2177	isp3_param_write(params_vdev,
2120	2178	ISP_PACK_2SHORT(arg->exc_wp_region0_yv0,
2121	2179	arg->exc_wp_region0_yv1),
2122		- ISP3X_RAWAWB_EXC_WP_REGION0_YV);
	2180	+ ISP3X_RAWAWB_EXC_WP_REGION0_YV, id);
2123	2181
2124	2182	isp3_param_write(params_vdev,
2125	2183	ISP_PACK_2SHORT(arg->exc_wp_region1_xu0,
2126	2184	arg->exc_wp_region1_xu1),
2127		- ISP3X_RAWAWB_EXC_WP_REGION1_XU);
	2185	+ ISP3X_RAWAWB_EXC_WP_REGION1_XU, id);
2128	2186
2129	2187	isp3_param_write(params_vdev,
2130	2188	ISP_PACK_2SHORT(arg->exc_wp_region1_yv0,
2131	2189	arg->exc_wp_region1_yv1),
2132		- ISP3X_RAWAWB_EXC_WP_REGION1_YV);
	2190	+ ISP3X_RAWAWB_EXC_WP_REGION1_YV, id);
2133	2191
2134	2192	isp3_param_write(params_vdev,
2135	2193	ISP_PACK_2SHORT(arg->exc_wp_region2_xu0,
2136	2194	arg->exc_wp_region2_xu1),
2137		- ISP3X_RAWAWB_EXC_WP_REGION2_XU);
	2195	+ ISP3X_RAWAWB_EXC_WP_REGION2_XU, id);
2138	2196
2139	2197	isp3_param_write(params_vdev,
2140	2198	ISP_PACK_2SHORT(arg->exc_wp_region2_yv0,
2141	2199	arg->exc_wp_region2_yv1),
2142		- ISP3X_RAWAWB_EXC_WP_REGION2_YV);
	2200	+ ISP3X_RAWAWB_EXC_WP_REGION2_YV, id);
2143	2201
2144	2202	isp3_param_write(params_vdev,
2145	2203	ISP_PACK_2SHORT(arg->exc_wp_region3_xu0,
2146	2204	arg->exc_wp_region3_xu1),
2147		- ISP3X_RAWAWB_EXC_WP_REGION3_XU);
	2205	+ ISP3X_RAWAWB_EXC_WP_REGION3_XU, id);
2148	2206
2149	2207	isp3_param_write(params_vdev,
2150	2208	ISP_PACK_2SHORT(arg->exc_wp_region3_yv0,
2151	2209	arg->exc_wp_region3_yv1),
2152		- ISP3X_RAWAWB_EXC_WP_REGION3_YV);
	2210	+ ISP3X_RAWAWB_EXC_WP_REGION3_YV, id);
2153	2211
2154	2212	isp3_param_write(params_vdev,
2155	2213	ISP_PACK_2SHORT(arg->exc_wp_region4_xu0,
2156	2214	arg->exc_wp_region4_xu1),
2157		- ISP3X_RAWAWB_EXC_WP_REGION4_XU);
	2215	+ ISP3X_RAWAWB_EXC_WP_REGION4_XU, id);
2158	2216
2159	2217	isp3_param_write(params_vdev,
2160	2218	ISP_PACK_2SHORT(arg->exc_wp_region4_yv0,
2161	2219	arg->exc_wp_region4_yv1),
2162		- ISP3X_RAWAWB_EXC_WP_REGION4_YV);
	2220	+ ISP3X_RAWAWB_EXC_WP_REGION4_YV, id);
2163	2221
2164	2222	isp3_param_write(params_vdev,
2165	2223	ISP_PACK_2SHORT(arg->exc_wp_region5_xu0,
2166	2224	arg->exc_wp_region5_xu1),
2167		- ISP3X_RAWAWB_EXC_WP_REGION5_XU);
	2225	+ ISP3X_RAWAWB_EXC_WP_REGION5_XU, id);
2168	2226
2169	2227	isp3_param_write(params_vdev,
2170	2228	ISP_PACK_2SHORT(arg->exc_wp_region5_yv0,
2171	2229	arg->exc_wp_region5_yv1),
2172		- ISP3X_RAWAWB_EXC_WP_REGION5_YV);
	2230	+ ISP3X_RAWAWB_EXC_WP_REGION5_YV, id);
2173	2231
2174	2232	isp3_param_write(params_vdev,
2175	2233	ISP_PACK_2SHORT(arg->exc_wp_region6_xu0,
2176	2234	arg->exc_wp_region6_xu1),
2177		- ISP3X_RAWAWB_EXC_WP_REGION6_XU);
	2235	+ ISP3X_RAWAWB_EXC_WP_REGION6_XU, id);
2178	2236
2179	2237	isp3_param_write(params_vdev,
2180	2238	ISP_PACK_2SHORT(arg->exc_wp_region6_yv0,
2181	2239	arg->exc_wp_region6_yv1),
2182		- ISP3X_RAWAWB_EXC_WP_REGION6_YV);
	2240	+ ISP3X_RAWAWB_EXC_WP_REGION6_YV, id);
2183	2241
2184	2242	isp3_param_write(params_vdev,
2185	2243	ISP_PACK_4BYTE(arg->exc_wp_region0_weight,
2186	2244	arg->exc_wp_region1_weight,
2187	2245	arg->exc_wp_region2_weight,
2188	2246	arg->exc_wp_region3_weight),
2189		- ISP32_RAWAWB_EXC_WP_WEIGHT0_3);
	2247	+ ISP32_RAWAWB_EXC_WP_WEIGHT0_3, id);
2190	2248
2191	2249	isp3_param_write(params_vdev,
2192	2250	ISP_PACK_4BYTE(arg->exc_wp_region4_weight,
2193	2251	arg->exc_wp_region5_weight,
2194	2252	arg->exc_wp_region6_weight, 0),
2195		- ISP32_RAWAWB_EXC_WP_WEIGHT4_6);
	2253	+ ISP32_RAWAWB_EXC_WP_WEIGHT4_6, id);
2196	2254
2197	2255	if (params_vdev->dev->isp_ver == ISP_V32) {
2198	2256	if (params_vdev->dev->hw_dev->is_single)
2199		- isp_rawawb_cfg_sram(params_vdev, arg, false);
	2257	+ isp_rawawb_cfg_sram(params_vdev, arg, false, id);
2200	2258	else
2201	2259	memcpy(arg_rec->wp_blk_wei_w, arg->wp_blk_wei_w,
2202	2260	ISP32_RAWAWB_WEIGHT_NUM);
2203	2261	} else {
2204	2262	for (i = 0; i < ISP32L_RAWAWB_WEIGHT_NUM; i++)
2205	2263	isp3_param_write(params_vdev, arg->win_weight[i],
2206		- ISP32L_RAWAWB_WIN_WEIGHT_0 + i * 4);
	2264	+ ISP32L_RAWAWB_WIN_WEIGHT_0 + i * 4, id);
2207	2265	}
2208	2266
2209	2267	/* avoid to override the old enable value */
2210		- value = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL);
	2268	+ value = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL, id);
2211	2269	value &= (ISP32_MODULE_EN \|
2212	2270	ISP32_RAWAWB_2DDR_PATH_EN \|
2213	2271	ISP32_RAWAWB_2DDR_PATH_DS);
..	..	@@ -2227,45 +2285,46 @@
2227	2285	!!arg->yuv3d_en0 << 3 \|
2228	2286	!!arg->xy_en0 << 2 \|
2229	2287	!!arg->uv_en0 << 1;
2230		- isp3_param_write(params_vdev, value, ISP3X_RAWAWB_CTRL);
	2288	+ isp3_param_write(params_vdev, value, ISP3X_RAWAWB_CTRL, id);
2231	2289
2232	2290	mask = ISP32_DRC2AWB_SEL \| ISP32_BNR2AWB_SEL \| ISP3X_RAWAWB_SEL(3);
2233	2291	val = ISP3X_RAWAWB_SEL(arg->rawawb_sel) \|
2234	2292	(arg->bnr2awb_sel & 0x1) << 26 \| (arg->drc2awb_sel & 0x1) << 27;
2235		- value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH);
	2293	+ value = isp3_param_read(params_vdev, ISP3X_VI_ISP_PATH, id);
2236	2294	if ((value & mask) != val) {
2237	2295	value &= ~mask;
2238	2296	value \|= val;
2239		- isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH);
	2297	+ isp3_param_write(params_vdev, value, ISP3X_VI_ISP_PATH, id);
2240	2298	}
2241	2299	}
2242	2300
2243	2301	static void
2244		-isp_rawawb_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2302	+isp_rawawb_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2245	2303	{
2246	2304	u32 awb_ctrl;
2247	2305
2248		- awb_ctrl = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL);
	2306	+ awb_ctrl = isp3_param_read_cache(params_vdev, ISP3X_RAWAWB_CTRL, id);
2249	2307	awb_ctrl &= ~ISP32_REG_WR_MASK;
2250	2308	if (en)
2251	2309	awb_ctrl \|= ISP32_MODULE_EN;
2252	2310	else
2253	2311	awb_ctrl &= ~ISP32_MODULE_EN;
2254	2312
2255		- isp3_param_write(params_vdev, awb_ctrl, ISP3X_RAWAWB_CTRL);
	2313	+ isp3_param_write(params_vdev, awb_ctrl, ISP3X_RAWAWB_CTRL, id);
2256	2314	}
2257	2315
2258	2316	static void
2259	2317	isp_rawhstlite_config(struct rkisp_isp_params_vdev *params_vdev,
2260		- const struct isp2x_rawhistlite_cfg *arg)
	2318	+ const struct isp2x_rawhistlite_cfg *arg, u32 id)
2261	2319	{
2262		- u32 i;
2263		- u32 value;
2264		- u32 hist_ctrl;
2265		- u32 block_hsize, block_vsize;
	2320	+ struct rkisp_device *ispdev = params_vdev->dev;
	2321	+ struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
	2322	+ u32 width = out_crop->width, height = out_crop->height;
	2323	+ u32 i, value, hist_ctrl, block_hsize, block_vsize;
	2324	+ u32 h_size, v_size, h_offs, v_offs;
2266	2325
2267	2326	/* avoid to override the old enable value */
2268		- hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL);
	2327	+ hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL, id);
2269	2328	hist_ctrl &= ISP3X_RAWHIST_EN;
2270	2329	hist_ctrl = hist_ctrl \|
2271	2330	ISP3X_RAWHIST_MODE(arg->mode) \|
..	..	@@ -2273,23 +2332,31 @@
2273	2332	if (params_vdev->dev->isp_ver == ISP_V32)
2274	2333	hist_ctrl \|= ISP3X_RAWHIST_DATASEL(arg->data_sel) \|
2275	2334	ISP3X_RAWHIST_WATERLINE(arg->waterline);
2276		- isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL);
	2335	+ isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL, id);
2277	2336
	2337	+ h_offs = arg->win.h_offs & ~0x1;
	2338	+ v_offs = arg->win.v_offs & ~0x1;
2278	2339	isp3_param_write(params_vdev,
2279		- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
2280		- ISP3X_RAWHIST_LITE_OFFS);
	2340	+ ISP_PACK_2SHORT(h_offs, v_offs),
	2341	+ ISP3X_RAWHIST_LITE_OFFS, id);
2281	2342
2282		- block_hsize = arg->win.h_size / ISP32_RAWHISTLITE_ROW_NUM - 1;
2283		- block_vsize = arg->win.v_size / ISP32_RAWHISTLITE_COLUMN_NUM - 1;
2284		- block_hsize &= 0xFFFE;
2285		- block_vsize &= 0xFFFE;
	2343	+ if (ispdev->hw_dev->unite)
	2344	+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
	2345	+ h_size = arg->win.h_size;
	2346	+ v_size = arg->win.v_size;
	2347	+ if (!h_size \|\| h_size + h_offs + 1 > width)
	2348	+ h_size = width - h_offs - 1;
	2349	+ if (!v_size \|\| v_size + v_offs + 1 > height)
	2350	+ v_size = height - v_offs - 1;
	2351	+ block_hsize = (h_size / ISP32_RAWHISTLITE_ROW_NUM) & ~0x1;
	2352	+ block_vsize = (v_size / ISP32_RAWHISTLITE_COLUMN_NUM) & ~0x1;
2286	2353	isp3_param_write(params_vdev,
2287	2354	ISP_PACK_2SHORT(block_hsize, block_vsize),
2288		- ISP3X_RAWHIST_LITE_SIZE);
	2355	+ ISP3X_RAWHIST_LITE_SIZE, id);
2289	2356
2290	2357	isp3_param_write(params_vdev,
2291	2358	ISP_PACK_4BYTE(arg->rcc, arg->gcc, arg->bcc, arg->off),
2292		- ISP3X_RAWHIST_LITE_RAW2Y_CC);
	2359	+ ISP3X_RAWHIST_LITE_RAW2Y_CC, id);
2293	2360
2294	2361	for (i = 0; i < (ISP32_RAWHISTLITE_WEIGHT_REG_SIZE / 4); i++) {
2295	2362	value = ISP_PACK_4BYTE(arg->weight[4 * i + 0],
..	..	@@ -2297,32 +2364,32 @@
2297	2364	arg->weight[4 * i + 2],
2298	2365	arg->weight[4 * i + 3]);
2299	2366	isp3_param_write(params_vdev, value,
2300		- ISP3X_RAWHIST_LITE_WEIGHT + 4 * i);
	2367	+ ISP3X_RAWHIST_LITE_WEIGHT + 4 * i, id);
2301	2368	}
2302	2369
2303	2370	value = ISP_PACK_4BYTE(arg->weight[4 * i + 0], 0, 0, 0);
2304	2371	isp3_param_write(params_vdev, value,
2305		- ISP3X_RAWHIST_LITE_WEIGHT + 4 * i);
	2372	+ ISP3X_RAWHIST_LITE_WEIGHT + 4 * i, id);
2306	2373	}
2307	2374
2308	2375	static void
2309		-isp_rawhstlite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2376	+isp_rawhstlite_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2310	2377	{
2311	2378	u32 hist_ctrl;
2312	2379
2313		- hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL);
	2380	+ hist_ctrl = isp3_param_read(params_vdev, ISP3X_RAWHIST_LITE_CTRL, id);
2314	2381	hist_ctrl &= ~(ISP32_MODULE_EN \| ISP32_REG_WR_MASK);
2315	2382
2316	2383	if (en)
2317	2384	hist_ctrl \|= ISP32_MODULE_EN;
2318	2385
2319		- isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL);
	2386	+ isp3_param_write(params_vdev, hist_ctrl, ISP3X_RAWHIST_LITE_CTRL, id);
2320	2387	}
2321	2388
2322	2389	static void
2323	2390	isp_rawhstbig_cfg_sram(struct rkisp_isp_params_vdev *params_vdev,
2324	2391	const struct isp2x_rawhistbig_cfg *arg,
2325		- u32 blk_no, bool is_check)
	2392	+ u32 blk_no, bool is_check, u32 id)
2326	2393	{
2327	2394	u32 i, j, wnd_num_idx, value;
2328	2395	u8 weight15x15[ISP32_RAWHISTBIG_WEIGHT_REG_SIZE];
..	..	@@ -2344,7 +2411,7 @@
2344	2411
2345	2412	value = ISP3X_RAWHIST_EN;
2346	2413	if (is_check &&
2347		- !(isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL) & value))
	2414	+ !(isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id) & value))
2348	2415	return;
2349	2416
2350	2417	wnd_num_idx = arg->wnd_num;
..	..	@@ -2369,13 +2436,16 @@
2369	2436
2370	2437	static void
2371	2438	isp_rawhstbig_config(struct rkisp_isp_params_vdev *params_vdev,
2372		- const struct isp2x_rawhistbig_cfg *arg, u32 blk_no)
	2439	+ const struct isp2x_rawhistbig_cfg *arg, u32 blk_no, u32 id)
2373	2440	{
2374		- struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params;
	2441	+ struct isp32_isp_params_cfg *params_rec = params_vdev->isp32_params + id;
2375	2442	struct rkisp_device *dev = params_vdev->dev;
	2443	+ struct v4l2_rect *out_crop = &dev->isp_sdev.out_crop;
	2444	+ u32 width = out_crop->width, height = out_crop->height;
2376	2445	struct isp2x_rawhistbig_cfg *arg_rec;
2377	2446	u32 hist_ctrl, block_hsize, block_vsize, wnd_num_idx;
2378	2447	const u32 hist_wnd_num[] = {5, 5, 15, 15};
	2448	+ u32 h_size, v_size, h_offs, v_offs;
2379	2449	u32 addr;
2380	2450
2381	2451	switch (blk_no) {
..	..	@@ -2396,7 +2466,7 @@
2396	2466
2397	2467	wnd_num_idx = arg->wnd_num;
2398	2468	/* avoid to override the old enable value */
2399		- hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL);
	2469	+ hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id);
2400	2470	hist_ctrl &= ISP3X_RAWHIST_EN;
2401	2471	hist_ctrl = hist_ctrl \|
2402	2472	ISP3X_RAWHIST_MODE(arg->mode) \|
..	..	@@ -2405,33 +2475,41 @@
2405	2475	if (params_vdev->dev->isp_ver == ISP_V32)
2406	2476	hist_ctrl \|= ISP3X_RAWHIST_DATASEL(arg->data_sel) \|
2407	2477	ISP3X_RAWHIST_WATERLINE(arg->waterline);
2408		- isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL);
	2478	+ isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL, id);
2409	2479
	2480	+ h_offs = arg->win.h_offs & ~0x1;
	2481	+ v_offs = arg->win.v_offs & ~0x1;
2410	2482	isp3_param_write(params_vdev,
2411		- ISP_PACK_2SHORT(arg->win.h_offs, arg->win.v_offs),
2412		- addr + ISP3X_RAWHIST_BIG_OFFS);
	2483	+ ISP_PACK_2SHORT(h_offs, v_offs),
	2484	+ addr + ISP3X_RAWHIST_BIG_OFFS, id);
2413	2485
2414		- block_hsize = arg->win.h_size / hist_wnd_num[wnd_num_idx] - 1;
2415		- block_vsize = arg->win.v_size / hist_wnd_num[wnd_num_idx] - 1;
2416		- block_hsize &= 0xFFFE;
2417		- block_vsize &= 0xFFFE;
	2486	+ if (dev->hw_dev->unite)
	2487	+ width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
	2488	+ h_size = arg->win.h_size;
	2489	+ v_size = arg->win.v_size;
	2490	+ if (!h_size \|\| h_size + h_offs + 1 > width)
	2491	+ h_size = width - h_offs - 1;
	2492	+ if (!v_size \|\| v_size + v_offs + 1 > height)
	2493	+ v_size = height - v_offs - 1;
	2494	+ block_hsize = (h_size / hist_wnd_num[wnd_num_idx]) & ~0x1;
	2495	+ block_vsize = (v_size / hist_wnd_num[wnd_num_idx]) & ~0x1;
2418	2496	isp3_param_write(params_vdev,
2419	2497	ISP_PACK_2SHORT(block_hsize, block_vsize),
2420		- addr + ISP3X_RAWHIST_BIG_SIZE);
	2498	+ addr + ISP3X_RAWHIST_BIG_SIZE, id);
2421	2499
2422	2500	isp3_param_write(params_vdev,
2423	2501	ISP_PACK_4BYTE(arg->rcc, arg->gcc, arg->bcc, arg->off),
2424		- addr + ISP3X_RAWHIST_BIG_RAW2Y_CC);
	2502	+ addr + ISP3X_RAWHIST_BIG_RAW2Y_CC, id);
2425	2503
2426	2504	if (dev->hw_dev->is_single)
2427		- isp_rawhstbig_cfg_sram(params_vdev, arg, blk_no, false);
	2505	+ isp_rawhstbig_cfg_sram(params_vdev, arg, blk_no, false, id);
2428	2506	else
2429	2507	arg_rec = arg;
2430	2508	}
2431	2509
2432	2510	static void
2433	2511	isp_rawhstbig_enable(struct rkisp_isp_params_vdev *params_vdev,
2434		- bool en, u32 blk_no)
	2512	+ bool en, u32 blk_no, u32 id)
2435	2513	{
2436	2514	u32 hist_ctrl;
2437	2515	u32 addr;
..	..	@@ -2449,72 +2527,72 @@
2449	2527	break;
2450	2528	}
2451	2529
2452		- hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL);
	2530	+ hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id);
2453	2531	hist_ctrl &= ~(ISP3X_RAWHIST_EN \| ISP32_REG_WR_MASK);
2454	2532	if (en)
2455	2533	hist_ctrl \|= ISP3X_RAWHIST_EN;
2456	2534
2457		- isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL);
	2535	+ isp3_param_write(params_vdev, hist_ctrl, addr + ISP3X_RAWHIST_BIG_CTRL, id);
2458	2536	}
2459	2537
2460	2538	static void
2461	2539	isp_rawhst1_config(struct rkisp_isp_params_vdev *params_vdev,
2462		- const struct isp2x_rawhistbig_cfg *arg)
	2540	+ const struct isp2x_rawhistbig_cfg *arg, u32 id)
2463	2541	{
2464		- isp_rawhstbig_config(params_vdev, arg, 1);
	2542	+ isp_rawhstbig_config(params_vdev, arg, 1, id);
2465	2543	}
2466	2544
2467	2545	static void
2468		-isp_rawhst1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2546	+isp_rawhst1_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2469	2547	{
2470		- isp_rawhstbig_enable(params_vdev, en, 1);
	2548	+ isp_rawhstbig_enable(params_vdev, en, 1, id);
2471	2549	}
2472	2550
2473	2551	static void
2474	2552	isp_rawhst2_config(struct rkisp_isp_params_vdev *params_vdev,
2475		- const struct isp2x_rawhistbig_cfg *arg)
	2553	+ const struct isp2x_rawhistbig_cfg *arg, u32 id)
2476	2554	{
2477		- isp_rawhstbig_config(params_vdev, arg, 2);
	2555	+ isp_rawhstbig_config(params_vdev, arg, 2, id);
2478	2556	}
2479	2557
2480	2558	static void
2481		-isp_rawhst2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2559	+isp_rawhst2_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2482	2560	{
2483		- isp_rawhstbig_enable(params_vdev, en, 2);
	2561	+ isp_rawhstbig_enable(params_vdev, en, 2, id);
2484	2562	}
2485	2563
2486	2564	static void
2487	2565	isp_rawhst3_config(struct rkisp_isp_params_vdev *params_vdev,
2488		- const struct isp2x_rawhistbig_cfg *arg)
	2566	+ const struct isp2x_rawhistbig_cfg *arg, u32 id)
2489	2567	{
2490		- isp_rawhstbig_config(params_vdev, arg, 0);
	2568	+ isp_rawhstbig_config(params_vdev, arg, 0, id);
2491	2569	}
2492	2570
2493	2571	static void
2494		-isp_rawhst3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2572	+isp_rawhst3_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2495	2573	{
2496		- isp_rawhstbig_enable(params_vdev, en, 0);
	2574	+ isp_rawhstbig_enable(params_vdev, en, 0, id);
2497	2575	}
2498	2576
2499	2577	static void
2500	2578	isp_hdrmge_config(struct rkisp_isp_params_vdev *params_vdev,
2501	2579	const struct isp32_hdrmge_cfg *arg,
2502		- enum rkisp_params_type type)
	2580	+ enum rkisp_params_type type, u32 id)
2503	2581	{
2504	2582	u32 value;
2505	2583	int i;
2506	2584
2507	2585	if (type == RKISP_PARAMS_SHD \|\| type == RKISP_PARAMS_ALL) {
2508	2586	value = ISP_PACK_2SHORT(arg->gain0, arg->gain0_inv);
2509		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN0);
	2587	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN0, id);
2510	2588
2511	2589	value = ISP_PACK_2SHORT(arg->gain1, arg->gain1_inv);
2512		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN1);
	2590	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN1, id);
2513	2591
2514	2592	value = arg->gain2;
2515		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN2);
	2593	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_GAIN2, id);
2516	2594
2517		- value = isp3_param_read_cache(params_vdev, ISP3X_HDRMGE_CTRL);
	2595	+ value = isp3_param_read_cache(params_vdev, ISP3X_HDRMGE_CTRL, id);
2518	2596	if (arg->s_base)
2519	2597	value \|= BIT(1);
2520	2598	else
..	..	@@ -2523,48 +2601,48 @@
2523	2601	value \|= BIT(6);
2524	2602	else
2525	2603	value &= ~BIT(6);
2526		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_CTRL);
	2604	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_CTRL, id);
2527	2605	}
2528	2606
2529	2607	if (type == RKISP_PARAMS_IMD \|\| type == RKISP_PARAMS_ALL) {
2530	2608	value = ISP_PACK_4BYTE(arg->ms_dif_0p8, arg->ms_diff_0p15,
2531	2609	arg->lm_dif_0p9, arg->lm_dif_0p15);
2532		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LIGHTZ);
	2610	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LIGHTZ, id);
2533	2611	value = (arg->ms_scl & 0x7ff) \|
2534	2612	(arg->ms_thd0 & 0x3ff) << 12 \|
2535	2613	(arg->ms_thd1 & 0x3ff) << 22;
2536		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_MS_DIFF);
	2614	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_MS_DIFF, id);
2537	2615	value = (arg->lm_scl & 0x7ff) \|
2538	2616	(arg->lm_thd0 & 0x3ff) << 12 \|
2539	2617	(arg->lm_thd1 & 0x3ff) << 22;
2540		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LM_DIFF);
	2618	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_LM_DIFF, id);
2541	2619
2542	2620	for (i = 0; i < ISP32_HDRMGE_L_CURVE_NUM; i++) {
2543	2621	value = ISP_PACK_2SHORT(arg->curve.curve_0[i], arg->curve.curve_1[i]);
2544		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_DIFF_Y0 + 4 * i);
	2622	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_DIFF_Y0 + 4 * i, id);
2545	2623	}
2546	2624
2547	2625	for (i = 0; i < ISP32_HDRMGE_E_CURVE_NUM; i++) {
2548	2626	value = (arg->l_raw1[i] & 0x3ff) << 20 \|
2549	2627	(arg->l_raw0[i] & 0x3ff) << 10 \|
2550	2628	(arg->e_y[i] & 0x3ff);
2551		- isp3_param_write(params_vdev, value, ISP3X_HDRMGE_OVER_Y0 + 4 * i);
	2629	+ isp3_param_write(params_vdev, value, ISP3X_HDRMGE_OVER_Y0 + 4 * i, id);
2552	2630	}
2553	2631
2554	2632	value = ISP_PACK_2SHORT(arg->each_raw_gain0, arg->each_raw_gain1);
2555		- isp3_param_write(params_vdev, value, ISP32_HDRMGE_EACH_GAIN);
	2633	+ isp3_param_write(params_vdev, value, ISP32_HDRMGE_EACH_GAIN, id);
2556	2634	}
2557	2635	}
2558	2636
2559	2637	static void
2560		-isp_hdrmge_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2638	+isp_hdrmge_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2561	2639	{
2562	2640	}
2563	2641
2564	2642	static void
2565	2643	isp_hdrdrc_config(struct rkisp_isp_params_vdev *params_vdev,
2566	2644	const struct isp32_drc_cfg *arg,
2567		- enum rkisp_params_type type)
	2645	+ enum rkisp_params_type type, u32 id)
2568	2646	{
2569	2647	u32 i, value;
2570	2648
..	..	@@ -2574,76 +2652,76 @@
2574	2652	value = (arg->offset_pow2 & 0x0F) << 28 \|
2575	2653	(arg->compres_scl & 0x1FFF) << 14 \|
2576	2654	(arg->position & 0x03FFF);
2577		- isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL1);
	2655	+ isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL1, id);
2578	2656
2579	2657	value = arg->delta_scalein << 24 \|
2580	2658	(arg->hpdetail_ratio & 0xFFF) << 12 \|
2581	2659	(arg->lpdetail_ratio & 0xFFF);
2582		- isp3_param_write(params_vdev, value, ISP3X_DRC_LPRATIO);
	2660	+ isp3_param_write(params_vdev, value, ISP3X_DRC_LPRATIO, id);
2583	2661
2584	2662	value = ISP_PACK_4BYTE(arg->bilat_wt_off, 0, arg->weipre_frame, arg->weicur_pix);
2585		- isp3_param_write(params_vdev, value, ISP3X_DRC_EXPLRATIO);
	2663	+ isp3_param_write(params_vdev, value, ISP3X_DRC_EXPLRATIO, id);
2586	2664
2587	2665	value = (arg->force_sgm_inv0 & 0xFFFF) << 16 \|
2588	2666	arg->motion_scl << 8 \| arg->edge_scl;
2589		- isp3_param_write(params_vdev, value, ISP3X_DRC_SIGMA);
	2667	+ isp3_param_write(params_vdev, value, ISP3X_DRC_SIGMA, id);
2590	2668
2591	2669	value = ISP_PACK_2SHORT(arg->space_sgm_inv0, arg->space_sgm_inv1);
2592		- isp3_param_write(params_vdev, value, ISP3X_DRC_SPACESGM);
	2670	+ isp3_param_write(params_vdev, value, ISP3X_DRC_SPACESGM, id);
2593	2671
2594	2672	value = ISP_PACK_2SHORT(arg->range_sgm_inv0, arg->range_sgm_inv1);
2595		- isp3_param_write(params_vdev, value, ISP3X_DRC_RANESGM);
	2673	+ isp3_param_write(params_vdev, value, ISP3X_DRC_RANESGM, id);
2596	2674
2597	2675	value = (arg->weig_bilat & 0x1f) \| (arg->weig_maxl & 0x1f) << 8 \|
2598	2676	(arg->bilat_soft_thd & 0x3fff) << 16;
2599	2677	if (arg->enable_soft_thd)
2600	2678	value \|= BIT(31);
2601		- isp3_param_write(params_vdev, value, ISP3X_DRC_BILAT);
	2679	+ isp3_param_write(params_vdev, value, ISP3X_DRC_BILAT, id);
2602	2680
2603	2681	for (i = 0; i < ISP32_DRC_Y_NUM / 2; i++) {
2604	2682	value = ISP_PACK_2SHORT(arg->gain_y[2 * i],
2605	2683	arg->gain_y[2 * i + 1]);
2606		- isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i);
	2684	+ isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i, id);
2607	2685	}
2608	2686	value = ISP_PACK_2SHORT(arg->gain_y[2 * i], 0);
2609		- isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i);
	2687	+ isp3_param_write(params_vdev, value, ISP3X_DRC_GAIN_Y0 + 4 * i, id);
2610	2688
2611	2689	for (i = 0; i < ISP32_DRC_Y_NUM / 2; i++) {
2612	2690	value = ISP_PACK_2SHORT(arg->compres_y[2 * i],
2613	2691	arg->compres_y[2 * i + 1]);
2614		- isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i);
	2692	+ isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i, id);
2615	2693	}
2616	2694	value = ISP_PACK_2SHORT(arg->compres_y[2 * i], 0);
2617		- isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i);
	2695	+ isp3_param_write(params_vdev, value, ISP3X_DRC_COMPRES_Y0 + 4 * i, id);
2618	2696
2619	2697	for (i = 0; i < ISP32_DRC_Y_NUM / 2; i++) {
2620	2698	value = ISP_PACK_2SHORT(arg->scale_y[2 * i],
2621	2699	arg->scale_y[2 * i + 1]);
2622		- isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i);
	2700	+ isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i, id);
2623	2701	}
2624	2702	value = ISP_PACK_2SHORT(arg->scale_y[2 * i], 0);
2625		- isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i);
	2703	+ isp3_param_write(params_vdev, value, ISP3X_DRC_SCALE_Y0 + 4 * i, id);
2626	2704
2627	2705	if (params_vdev->dev->isp_ver == ISP_V32)
2628	2706	value = ISP_PACK_2SHORT(arg->min_ogain, arg->iir_weight);
2629	2707	else
2630	2708	value = ISP_PACK_2SHORT(arg->min_ogain, 0);
2631		- isp3_param_write(params_vdev, value, ISP3X_DRC_IIRWG_GAIN);
	2709	+ isp3_param_write(params_vdev, value, ISP3X_DRC_IIRWG_GAIN, id);
2632	2710
2633	2711	value = arg->gas_t & 0x1fff;
2634		- isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_CTRL);
	2712	+ isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_CTRL, id);
2635	2713
2636	2714	value = ISP_PACK_4BYTE(arg->gas_l0, arg->gas_l1, arg->gas_l2, arg->gas_l3);
2637		- isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_GAS);
	2715	+ isp3_param_write(params_vdev, value, ISP32_DRC_LUM3X2_GAS, id);
2638	2716	}
2639	2717
2640	2718	static void
2641		-isp_hdrdrc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2719	+isp_hdrdrc_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2642	2720	{
2643	2721	u32 value;
2644	2722	bool real_en;
2645	2723
2646		- value = isp3_param_read(params_vdev, ISP3X_DRC_CTRL0);
	2724	+ value = isp3_param_read(params_vdev, ISP3X_DRC_CTRL0, id);
2647	2725	real_en = !!(value & ISP32_MODULE_EN);
2648	2726	if ((en && real_en) \|\| (!en && !real_en))
2649	2727	return;
..	..	@@ -2651,17 +2729,17 @@
2651	2729	if (en) {
2652	2730	value \|= ISP32_MODULE_EN;
2653	2731	isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
2654		- ISP3X_ADRC_FST_FRAME);
	2732	+ ISP3X_ADRC_FST_FRAME, id);
2655	2733	} else {
2656	2734	value = 0;
2657		- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(12));
	2735	+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(12), id);
2658	2736	}
2659		- isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL0);
	2737	+ isp3_param_write(params_vdev, value, ISP3X_DRC_CTRL0, id);
2660	2738	}
2661	2739
2662	2740	static void
2663	2741	isp_gic_config(struct rkisp_isp_params_vdev *params_vdev,
2664		- const struct isp21_gic_cfg *arg)
	2742	+ const struct isp21_gic_cfg *arg, u32 id)
2665	2743	{
2666	2744	u32 value;
2667	2745	s32 i;
..	..	@@ -2669,12 +2747,12 @@
2669	2747	value = (arg->regmingradthrdark2 & 0x03FF) << 20 \|
2670	2748	(arg->regmingradthrdark1 & 0x03FF) << 10 \|
2671	2749	(arg->regminbusythre & 0x03FF);
2672		- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA1);
	2750	+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA1, id);
2673	2751
2674	2752	value = (arg->regdarkthre & 0x07FF) << 21 \|
2675	2753	(arg->regmaxcorvboth & 0x03FF) << 11 \|
2676	2754	(arg->regdarktthrehi & 0x07FF);
2677		- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA2);
	2755	+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA2, id);
2678	2756
2679	2757	value = (arg->regkgrad2dark & 0x0F) << 28 \|
2680	2758	(arg->regkgrad1dark & 0x0F) << 24 \|
..	..	@@ -2683,46 +2761,46 @@
2683	2761	(arg->regkgrad2 & 0x0F) << 8 \|
2684	2762	(arg->regkgrad1 & 0x0F) << 4 \|
2685	2763	(arg->reggbthre & 0x0F);
2686		- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA3);
	2764	+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA3, id);
2687	2765
2688	2766	value = (arg->regmaxcorv & 0x03FF) << 20 \|
2689	2767	(arg->regmingradthr2 & 0x03FF) << 10 \|
2690	2768	(arg->regmingradthr1 & 0x03FF);
2691		- isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA4);
	2769	+ isp3_param_write(params_vdev, value, ISP3X_GIC_DIFF_PARA4, id);
2692	2770
2693	2771	value = (arg->gr_ratio & 0x03) << 28 \|
2694	2772	(arg->noise_scale & 0x7F) << 12 \|
2695	2773	(arg->noise_base & 0xFFF);
2696		- isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA1);
	2774	+ isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA1, id);
2697	2775
2698	2776	value = arg->diff_clip & 0x7fff;
2699		- isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA2);
	2777	+ isp3_param_write(params_vdev, value, ISP3X_GIC_NOISE_PARA2, id);
2700	2778
2701	2779	for (i = 0; i < ISP32_GIC_SIGMA_Y_NUM / 2; i++) {
2702	2780	value = ISP_PACK_2SHORT(arg->sigma_y[2 * i], arg->sigma_y[2 * i + 1]);
2703		- isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i);
	2781	+ isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i, id);
2704	2782	}
2705	2783	value = ISP_PACK_2SHORT(arg->sigma_y[2 * i], 0);
2706		- isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i);
	2784	+ isp3_param_write(params_vdev, value, ISP3X_GIC_SIGMA_VALUE0 + 4 * i, id);
2707	2785	}
2708	2786
2709	2787	static void
2710		-isp_gic_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2788	+isp_gic_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2711	2789	{
2712	2790	u32 value = 0;
2713	2791
2714	2792	if (en)
2715	2793	value \|= ISP32_MODULE_EN;
2716		- isp3_param_write(params_vdev, value, ISP3X_GIC_CONTROL);
	2794	+ isp3_param_write(params_vdev, value, ISP3X_GIC_CONTROL, id);
2717	2795	}
2718	2796
2719	2797	static void
2720	2798	isp_dhaz_config(struct rkisp_isp_params_vdev *params_vdev,
2721		- const struct isp32_dhaz_cfg *arg)
	2799	+ const struct isp32_dhaz_cfg *arg, u32 id)
2722	2800	{
2723	2801	u32 i, value, ctrl;
2724	2802
2725		- ctrl = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL);
	2803	+ ctrl = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL, id);
2726	2804	ctrl &= ISP3X_DHAZ_ENMUX;
2727	2805
2728	2806	ctrl \|= !!arg->enh_luma_en << 28 \| !!arg->color_deviate_en << 27 \|
..	..	@@ -2736,109 +2814,109 @@
2736	2814	value = (arg->hist_wr[i * 3] & 0x3ff) \|
2737	2815	(arg->hist_wr[i * 3 + 1] & 0x3ff) << 10 \|
2738	2816	(arg->hist_wr[i * 3 + 2] & 0x3ff) << 20;
2739		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4);
	2817	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4, id);
2740	2818	}
2741	2819	value = arg->hist_wr[i * 3] & 0x3ff;
2742		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4);
	2820	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_HIST_WR0 + i * 4, id);
2743	2821	}
2744		- isp3_param_write(params_vdev, ctrl, ISP3X_DHAZ_CTRL);
	2822	+ isp3_param_write(params_vdev, ctrl, ISP3X_DHAZ_CTRL, id);
2745	2823
2746	2824	value = ISP_PACK_4BYTE(arg->dc_min_th, arg->dc_max_th,
2747	2825	arg->yhist_th, arg->yblk_th);
2748		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP0);
	2826	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP0, id);
2749	2827
2750	2828	value = ISP_PACK_4BYTE(arg->bright_min, arg->bright_max,
2751	2829	arg->wt_max, 0);
2752		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP1);
	2830	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP1, id);
2753	2831
2754	2832	value = ISP_PACK_4BYTE(arg->air_min, arg->air_max,
2755	2833	arg->dark_th, arg->tmax_base);
2756		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP2);
	2834	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP2, id);
2757	2835
2758	2836	value = ISP_PACK_2SHORT(arg->tmax_off, arg->tmax_max);
2759		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_TMAX);
	2837	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_TMAX, id);
2760	2838
2761	2839	value = (arg->hist_min & 0xFFFF) << 16 \|
2762	2840	(arg->hist_th_off & 0xFF) << 8 \|
2763	2841	(arg->hist_k & 0x1F);
2764		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST0);
	2842	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST0, id);
2765	2843
2766	2844	value = ISP_PACK_2SHORT(arg->hist_scale, arg->hist_gratio);
2767		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST1);
	2845	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ADP_HIST1, id);
2768	2846
2769	2847	value = ISP_PACK_2SHORT(arg->enhance_chroma, arg->enhance_value);
2770		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENHANCE);
	2848	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENHANCE, id);
2771	2849
2772	2850	value = (arg->iir_wt_sigma & 0x07FF) << 16 \|
2773	2851	(arg->iir_sigma & 0xFF) << 8 \|
2774	2852	(arg->stab_fnum & 0x1F);
2775		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR0);
	2853	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR0, id);
2776	2854
2777	2855	value = (arg->iir_pre_wet & 0x0F) << 24 \|
2778	2856	(arg->iir_tmax_sigma & 0x7FF) << 8 \|
2779	2857	(arg->iir_air_sigma & 0xFF);
2780		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR1);
	2858	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_IIR1, id);
2781	2859
2782	2860	value = (arg->cfg_wt & 0x01FF) << 16 \|
2783	2861	(arg->cfg_air & 0xFF) << 8 \|
2784	2862	(arg->cfg_alpha & 0xFF);
2785		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG0);
	2863	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG0, id);
2786	2864
2787	2865	value = ISP_PACK_2SHORT(arg->cfg_tmax, arg->cfg_gratio);
2788		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG1);
	2866	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_SOFT_CFG1, id);
2789	2867
2790	2868	value = (arg->range_sima & 0x01FF) << 16 \|
2791	2869	(arg->space_sigma_pre & 0xFF) << 8 \|
2792	2870	(arg->space_sigma_cur & 0xFF);
2793		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_SIGMA);
	2871	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_SIGMA, id);
2794	2872
2795	2873	value = ISP_PACK_2SHORT(arg->bf_weight, arg->dc_weitcur);
2796		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_WET);
	2874	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_BF_WET, id);
2797	2875
2798	2876	for (i = 0; i < ISP32_DHAZ_ENH_CURVE_NUM / 2; i++) {
2799	2877	value = ISP_PACK_2SHORT(arg->enh_curve[2 * i], arg->enh_curve[2 * i + 1]);
2800		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i);
	2878	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i, id);
2801	2879	}
2802	2880	value = ISP_PACK_2SHORT(arg->enh_curve[2 * i], 0);
2803		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i);
	2881	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_ENH_CURVE0 + 4 * i, id);
2804	2882
2805	2883	value = ISP_PACK_4BYTE(arg->gaus_h0, arg->gaus_h1, arg->gaus_h2, 0);
2806		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAUS);
	2884	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAUS, id);
2807	2885
2808	2886	for (i = 0; i < ISP32_DHAZ_SIGMA_IDX_NUM / 4; i++) {
2809	2887	value = ISP_PACK_4BYTE(arg->sigma_idx[i * 4], arg->sigma_idx[i * 4 + 1],
2810	2888	arg->sigma_idx[i * 4 + 2], arg->sigma_idx[i * 4 + 3]);
2811		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4);
	2889	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4, id);
2812	2890	}
2813	2891	value = ISP_PACK_4BYTE(arg->sigma_idx[i * 4], arg->sigma_idx[i * 4 + 1],
2814	2892	arg->sigma_idx[i * 4 + 2], 0);
2815		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4);
	2893	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_IDX0 + i * 4, id);
2816	2894
2817	2895	for (i = 0; i < ISP32_DHAZ_SIGMA_LUT_NUM / 2; i++) {
2818	2896	value = ISP_PACK_2SHORT(arg->sigma_lut[i * 2], arg->sigma_lut[i * 2 + 1]);
2819		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4);
	2897	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4, id);
2820	2898	}
2821	2899	value = ISP_PACK_2SHORT(arg->sigma_lut[i * 2], 0);
2822		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4);
	2900	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4, id);
2823	2901
2824	2902	for (i = 0; i < ISP32_DHAZ_ENH_LUMA_NUM / 3; i++) {
2825	2903	value = (arg->enh_luma[i * 3 + 2] & 0x3ff) << 20 \|
2826	2904	(arg->enh_luma[i * 3 + 1] & 0x3ff) << 10 \|
2827	2905	(arg->enh_luma[i * 3] & 0x3ff);
2828		- isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4);
	2906	+ isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4, id);
2829	2907	}
2830	2908	value = (arg->enh_luma[i * 3 + 1] & 0x3ff) << 10 \|
2831	2909	(arg->enh_luma[i * 3] & 0x3ff);
2832		- isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4);
	2910	+ isp3_param_write(params_vdev, value, ISP32_DHAZ_ENH_LUMA0 + i * 4, id);
2833	2911	}
2834	2912
2835	2913	static void
2836		-isp_dhaz_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2914	+isp_dhaz_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2837	2915	{
2838	2916	u32 value;
2839	2917	bool real_en;
2840	2918
2841		- value = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL);
	2919	+ value = isp3_param_read(params_vdev, ISP3X_DHAZ_CTRL, id);
2842	2920	real_en = !!(value & ISP3X_DHAZ_ENMUX);
2843	2921	if ((en && real_en) \|\| (!en && !real_en))
2844	2922	return;
..	..	@@ -2846,17 +2924,17 @@
2846	2924	if (en) {
2847	2925	value \|= ISP32_SELF_FORCE_UPD \| ISP3X_DHAZ_ENMUX;
2848	2926	isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
2849		- ISP3X_DHAZ_FST_FRAME);
	2927	+ ISP3X_DHAZ_FST_FRAME, id);
2850	2928	} else {
2851	2929	value &= ~ISP3X_DHAZ_ENMUX;
2852		- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(16));
	2930	+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(16), id);
2853	2931	}
2854		- isp3_param_write(params_vdev, value, ISP3X_DHAZ_CTRL);
	2932	+ isp3_param_write(params_vdev, value, ISP3X_DHAZ_CTRL, id);
2855	2933	}
2856	2934
2857	2935	static void
2858	2936	isp_3dlut_config(struct rkisp_isp_params_vdev *params_vdev,
2859		- const struct isp2x_3dlut_cfg *arg)
	2937	+ const struct isp2x_3dlut_cfg *arg, u32 id)
2860	2938	{
2861	2939	struct rkisp_device *dev = params_vdev->dev;
2862	2940	struct rkisp_isp_params_val_v32 *priv_val;
..	..	@@ -2864,58 +2942,58 @@
2864	2942	u32 *data;
2865	2943
2866	2944	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
2867		- buf_idx = (priv_val->buf_3dlut_idx++) % ISP32_3DLUT_BUF_NUM;
	2945	+ buf_idx = (priv_val->buf_3dlut_idx[id]++) % ISP32_3DLUT_BUF_NUM;
2868	2946
2869		- if (!priv_val->buf_3dlut[buf_idx].vaddr) {
	2947	+ if (!priv_val->buf_3dlut[id][buf_idx].vaddr) {
2870	2948	dev_err(dev->dev, "no find 3dlut buf\n");
2871	2949	return;
2872	2950	}
2873		- data = (u32 *)priv_val->buf_3dlut[buf_idx].vaddr;
	2951	+ data = (u32 *)priv_val->buf_3dlut[id][buf_idx].vaddr;
2874	2952	for (i = 0; i < arg->actual_size; i++)
2875	2953	data[i] = (arg->lut_b[i] & 0x3FF) \|
2876	2954	(arg->lut_g[i] & 0xFFF) << 10 \|
2877	2955	(arg->lut_r[i] & 0x3FF) << 22;
2878		- rkisp_prepare_buffer(params_vdev->dev, &priv_val->buf_3dlut[buf_idx]);
2879		- value = priv_val->buf_3dlut[buf_idx].dma_addr;
2880		- isp3_param_write(params_vdev, value, ISP3X_MI_LUT_3D_RD_BASE);
2881		- isp3_param_write(params_vdev, arg->actual_size, ISP3X_MI_LUT_3D_RD_WSIZE);
	2956	+ rkisp_prepare_buffer(params_vdev->dev, &priv_val->buf_3dlut[id][buf_idx]);
	2957	+ value = priv_val->buf_3dlut[id][buf_idx].dma_addr;
	2958	+ isp3_param_write(params_vdev, value, ISP3X_MI_LUT_3D_RD_BASE, id);
	2959	+ isp3_param_write(params_vdev, arg->actual_size, ISP3X_MI_LUT_3D_RD_WSIZE, id);
2882	2960
2883		- value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL);
	2961	+ value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL, id);
2884	2962	value &= ISP3X_3DLUT_EN;
2885	2963
2886	2964	if (value)
2887		- isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
	2965	+ isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
2888	2966
2889		- isp3_param_write(params_vdev, value, ISP3X_3DLUT_CTRL);
	2967	+ isp3_param_write(params_vdev, value, ISP3X_3DLUT_CTRL, id);
2890	2968	}
2891	2969
2892	2970	static void
2893		-isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	2971	+isp_3dlut_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2894	2972	{
2895	2973	u32 value;
2896	2974	bool en_state;
2897	2975	struct rkisp_isp_params_val_v32 *priv_val;
2898	2976
2899		- value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL);
	2977	+ value = isp3_param_read(params_vdev, ISP3X_3DLUT_CTRL, id);
2900	2978	en_state = (value & ISP3X_3DLUT_EN) ? true : false;
2901	2979
2902	2980	if (en == en_state)
2903	2981	return;
2904	2982
2905	2983	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
2906		- if (en && priv_val->buf_3dlut[0].vaddr) {
2907		- isp3_param_set_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01);
2908		- isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
	2984	+ if (en && priv_val->buf_3dlut[id][0].vaddr) {
	2985	+ isp3_param_set_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01, id);
	2986	+ isp3_param_set_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
2909	2987	} else {
2910		- isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01);
2911		- isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01);
2912		- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(20));
	2988	+ isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_CTRL, 0x01, id);
	2989	+ isp3_param_clear_bits(params_vdev, ISP3X_3DLUT_UPDATE, 0x01, id);
	2990	+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(20), id);
2913	2991	}
2914	2992	}
2915	2993
2916	2994	static void
2917	2995	isp_ldch_config(struct rkisp_isp_params_vdev *params_vdev,
2918		- const struct isp32_ldch_cfg *arg)
	2996	+ const struct isp32_ldch_cfg *arg, u32 id)
2919	2997	{
2920	2998	struct rkisp_device *dev = params_vdev->dev;
2921	2999	struct rkisp_isp_params_val_v32 *priv_val;
..	..	@@ -2923,7 +3001,7 @@
2923	3001	int buf_idx, i;
2924	3002	u32 value;
2925	3003
2926		- value = isp3_param_read(params_vdev, ISP3X_LDCH_STS);
	3004	+ value = isp3_param_read(params_vdev, ISP3X_LDCH_STS, id);
2927	3005	value &= ISP32_MODULE_EN;
2928	3006	value \|= !!arg->map13p3_en << 7 \|
2929	3007	!!arg->force_map_en << 6 \|
..	..	@@ -2931,20 +3009,20 @@
2931	3009	!!arg->sample_avr_en << 3 \|
2932	3010	!!arg->zero_interp_en << 2 \|
2933	3011	!!arg->frm_end_dis << 1;
2934		- isp3_param_write(params_vdev, value, ISP3X_LDCH_STS);
	3012	+ isp3_param_write(params_vdev, value, ISP3X_LDCH_STS, id);
2935	3013	if (arg->bic_mode_en) {
2936	3014	for (i = 0; i < ISP32_LDCH_BIC_NUM / 4; i++) {
2937	3015	value = ISP_PACK_4BYTE(arg->bicubic[i * 4], arg->bicubic[i * 4 + 1],
2938	3016	arg->bicubic[i * 4 + 2], arg->bicubic[i * 4 + 3]);
2939		- isp3_param_write(params_vdev, value, ISP32_LDCH_BIC_TABLE0 + i * 4);
	3017	+ isp3_param_write(params_vdev, value, ISP32_LDCH_BIC_TABLE0 + i * 4, id);
2940	3018	}
2941	3019	}
2942	3020
2943	3021	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
2944	3022	for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
2945		- if (!priv_val->buf_ldch[i].mem_priv)
	3023	+ if (!priv_val->buf_ldch[id][i].mem_priv)
2946	3024	continue;
2947		- if (arg->buf_fd == priv_val->buf_ldch[i].dma_fd)
	3025	+ if (arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd)
2948	3026	break;
2949	3027	}
2950	3028	if (i == ISP32_MESH_BUF_NUM) {
..	..	@@ -2952,28 +3030,28 @@
2952	3030	return;
2953	3031	}
2954	3032
2955		- if (!priv_val->buf_ldch[i].vaddr) {
	3033	+ if (!priv_val->buf_ldch[id][i].vaddr) {
2956	3034	dev_err(dev->dev, "no ldch buffer allocated\n");
2957	3035	return;
2958	3036	}
2959	3037
2960		- buf_idx = priv_val->buf_ldch_idx;
2961		- head = (struct isp2x_mesh_head *)priv_val->buf_ldch[buf_idx].vaddr;
	3038	+ buf_idx = priv_val->buf_ldch_idx[id];
	3039	+ head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][buf_idx].vaddr;
2962	3040	head->stat = MESH_BUF_INIT;
2963	3041
2964	3042	buf_idx = i;
2965		- head = (struct isp2x_mesh_head *)priv_val->buf_ldch[buf_idx].vaddr;
	3043	+ head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][buf_idx].vaddr;
2966	3044	head->stat = MESH_BUF_CHIPINUSE;
2967		- priv_val->buf_ldch_idx = buf_idx;
2968		- rkisp_prepare_buffer(dev, &priv_val->buf_ldch[buf_idx]);
2969		- value = priv_val->buf_ldch[buf_idx].dma_addr + head->data_oft;
2970		- isp3_param_write(params_vdev, value, ISP3X_MI_LUT_LDCH_RD_BASE);
2971		- isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_LDCH_RD_H_WSIZE);
2972		- isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_LDCH_RD_V_SIZE);
	3045	+ priv_val->buf_ldch_idx[id] = buf_idx;
	3046	+ rkisp_prepare_buffer(dev, &priv_val->buf_ldch[id][buf_idx]);
	3047	+ value = priv_val->buf_ldch[id][buf_idx].dma_addr + head->data_oft;
	3048	+ isp3_param_write(params_vdev, value, ISP3X_MI_LUT_LDCH_RD_BASE, id);
	3049	+ isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_LDCH_RD_H_WSIZE, id);
	3050	+ isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_LDCH_RD_V_SIZE, id);
2973	3051	}
2974	3052
2975	3053	static void
2976		-isp_ldch_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3054	+isp_ldch_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
2977	3055	{
2978	3056	struct rkisp_device *dev = params_vdev->dev;
2979	3057	struct rkisp_isp_params_val_v32 *priv_val;
..	..	@@ -2981,24 +3059,24 @@
2981	3059
2982	3060	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
2983	3061	if (en) {
2984		- buf_idx = priv_val->buf_ldch_idx;
2985		- if (!priv_val->buf_ldch[buf_idx].vaddr) {
	3062	+ buf_idx = priv_val->buf_ldch_idx[id];
	3063	+ if (!priv_val->buf_ldch[id][buf_idx].vaddr) {
2986	3064	dev_err(dev->dev, "no ldch buffer allocated\n");
2987	3065	return;
2988	3066	}
2989		- isp3_param_set_bits(params_vdev, ISP3X_LDCH_STS, 0x01);
	3067	+ isp3_param_set_bits(params_vdev, ISP3X_LDCH_STS, 0x01, id);
2990	3068	} else {
2991		- isp3_param_clear_bits(params_vdev, ISP3X_LDCH_STS, 0x01);
	3069	+ isp3_param_clear_bits(params_vdev, ISP3X_LDCH_STS, 0x01, id);
2992	3070	}
2993	3071	}
2994	3072
2995	3073	static void
2996	3074	isp_ynr_config(struct rkisp_isp_params_vdev *params_vdev,
2997		- const struct isp32_ynr_cfg *arg)
	3075	+ const struct isp32_ynr_cfg *arg, u32 id)
2998	3076	{
2999	3077	u32 i, value;
3000	3078
3001		- value = isp3_param_read(params_vdev, ISP3X_YNR_GLOBAL_CTRL);
	3079	+ value = isp3_param_read(params_vdev, ISP3X_YNR_GLOBAL_CTRL, id);
3002	3080	value &= ISP32_MODULE_EN;
3003	3081
3004	3082	value \|= !!arg->rnr_en << 26 \|
..	..	@@ -3011,96 +3089,96 @@
3011	3089	!!arg->lgft3x3_bypass << 3 \|
3012	3090	!!arg->lbft5x5_bypass << 2 \|
3013	3091	!!arg->bft3x3_bypass << 1;
3014		- isp3_param_write(params_vdev, value, ISP3X_YNR_GLOBAL_CTRL);
	3092	+ isp3_param_write(params_vdev, value, ISP3X_YNR_GLOBAL_CTRL, id);
3015	3093
3016	3094	value = ISP_PACK_2SHORT(arg->rnr_max_r, arg->local_gainscale);
3017		- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_MAX_R);
	3095	+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_MAX_R, id);
3018	3096
3019	3097	value = ISP_PACK_2SHORT(arg->rnr_center_coorh, arg->rnr_center_coorv);
3020		- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_CENTER_COOR);
	3098	+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_CENTER_COOR, id);
3021	3099
3022	3100	value = ISP_PACK_2SHORT(arg->loclagain_adj_thresh, arg->localgain_adj);
3023		- isp3_param_write(params_vdev, value, ISP3X_YNR_LOCAL_GAIN_CTRL);
	3101	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOCAL_GAIN_CTRL, id);
3024	3102
3025	3103	value = ISP_PACK_2SHORT(arg->low_bf_inv0, arg->low_bf_inv1);
3026		- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL0);
	3104	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL0, id);
3027	3105
3028	3106	value = ISP_PACK_2SHORT(arg->low_thred_adj, arg->low_peak_supress);
3029		- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL1);
	3107	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL1, id);
3030	3108
3031	3109	value = ISP_PACK_2SHORT(arg->low_edge_adj_thresh, arg->low_dist_adj);
3032		- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL2);
	3110	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL2, id);
3033	3111
3034	3112	value = (arg->low_bi_weight & 0xFF) << 24 \|
3035	3113	(arg->low_weight & 0xFF) << 16 \|
3036	3114	(arg->low_center_weight & 0xFFFF);
3037		- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL3);
	3115	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL3, id);
3038	3116
3039	3117	value = ISP_PACK_2SHORT(arg->lbf_weight_thres, arg->frame_full_size);
3040	3118	if (params_vdev->dev->isp_ver == ISP_V32_L)
3041	3119	value \|= (arg->frame_add4line & 0xf) << 12;
3042		- isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL4);
	3120	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LOWNR_CTRL4, id);
3043	3121
3044	3122	value = (arg->low_gauss1_coeff2 & 0xFFFF) << 16 \|
3045	3123	(arg->low_gauss1_coeff1 & 0xFF) << 8 \|
3046	3124	(arg->low_gauss1_coeff0 & 0xFF);
3047		- isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS1_COEFF);
	3125	+ isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS1_COEFF, id);
3048	3126
3049	3127	value = (arg->low_gauss2_coeff2 & 0xFFFF) << 16 \|
3050	3128	(arg->low_gauss2_coeff1 & 0xFF) << 8 \|
3051	3129	(arg->low_gauss2_coeff0 & 0xFF);
3052		- isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS2_COEFF);
	3130	+ isp3_param_write(params_vdev, value, ISP3X_YNR_GAUSS2_COEFF, id);
3053	3131
3054	3132	for (i = 0; i < ISP32_YNR_XY_NUM / 2; i++) {
3055	3133	value = ISP_PACK_2SHORT(arg->luma_points_x[2 * i],
3056	3134	arg->luma_points_x[2 * i + 1]);
3057		- isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i);
	3135	+ isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i, id);
3058	3136	}
3059	3137	value = ISP_PACK_2SHORT(arg->luma_points_x[2 * i], 0);
3060		- isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i);
	3138	+ isp3_param_write(params_vdev, value, ISP3X_YNR_SGM_DX_0_1 + 4 * i, id);
3061	3139
3062	3140	for (i = 0; i < ISP32_YNR_XY_NUM / 2; i++) {
3063	3141	value = ISP_PACK_2SHORT(arg->lsgm_y[2 * i],
3064	3142	arg->lsgm_y[2 * i + 1]);
3065		- isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i);
	3143	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i, id);
3066	3144	}
3067	3145	value = ISP_PACK_2SHORT(arg->lsgm_y[2 * i], 0);
3068		- isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i);
	3146	+ isp3_param_write(params_vdev, value, ISP3X_YNR_LSGM_Y_0_1 + 4 * i, id);
3069	3147
3070	3148	for (i = 0; i < ISP32_YNR_XY_NUM / 4; i++) {
3071	3149	value = ISP_PACK_4BYTE(arg->rnr_strength3[4 * i],
3072	3150	arg->rnr_strength3[4 * i + 1],
3073	3151	arg->rnr_strength3[4 * i + 2],
3074	3152	arg->rnr_strength3[4 * i + 3]);
3075		- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i);
	3153	+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i, id);
3076	3154	}
3077	3155	value = ISP_PACK_4BYTE(arg->rnr_strength3[4 * i], 0, 0, 0);
3078		- isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i);
	3156	+ isp3_param_write(params_vdev, value, ISP3X_YNR_RNR_STRENGTH03 + 4 * i, id);
3079	3157
3080	3158	value = (arg->nlm_hi_bf_scale & 0x3ff) << 16 \|
3081	3159	(arg->nlm_hi_gain_alpha & 0x1f) << 11 \|
3082	3160	(arg->nlm_min_sigma & 0x7ff);
3083		- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_SIGMA_GAIN);
	3161	+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_SIGMA_GAIN, id);
3084	3162
3085	3163	value = (arg->nlm_coe[5] & 0xf) << 20 \| (arg->nlm_coe[4] & 0xf) << 16 \|
3086	3164	(arg->nlm_coe[3] & 0xf) << 12 \| (arg->nlm_coe[2] & 0xf) << 8 \|
3087	3165	(arg->nlm_coe[1] & 0xf) << 4 \| (arg->nlm_coe[0] & 0xf);
3088		- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_COE);
	3166	+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_COE, id);
3089	3167
3090	3168	value = (arg->nlm_center_weight & 0x3ffff) << 10 \| (arg->nlm_weight_offset & 0x3ff);
3091		- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_WEIGHT);
	3169	+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_WEIGHT, id);
3092	3170
3093	3171	value = arg->nlm_nr_weight & 0x7ff;
3094		- isp3_param_write(params_vdev, value, ISP32_YNR_NLM_NR_WEIGHT);
	3172	+ isp3_param_write(params_vdev, value, ISP32_YNR_NLM_NR_WEIGHT, id);
3095	3173	}
3096	3174
3097	3175	static void
3098		-isp_ynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3176	+isp_ynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3099	3177	{
3100	3178	u32 ynr_ctrl;
3101	3179	bool real_en;
3102	3180
3103		- ynr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_YNR_GLOBAL_CTRL);
	3181	+ ynr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_YNR_GLOBAL_CTRL, id);
3104	3182	real_en = !!(ynr_ctrl & ISP32_MODULE_EN);
3105	3183	if ((en && real_en) \|\| (!en && !real_en))
3106	3184	return;
..	..	@@ -3108,22 +3186,22 @@
3108	3186	if (en) {
3109	3187	ynr_ctrl \|= ISP32_MODULE_EN;
3110	3188	isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
3111		- ISP3X_YNR_FST_FRAME);
	3189	+ ISP3X_YNR_FST_FRAME, id);
3112	3190	} else {
3113	3191	ynr_ctrl &= ~ISP32_MODULE_EN;
3114	3192	}
3115	3193
3116		- isp3_param_write(params_vdev, ynr_ctrl, ISP3X_YNR_GLOBAL_CTRL);
	3194	+ isp3_param_write(params_vdev, ynr_ctrl, ISP3X_YNR_GLOBAL_CTRL, id);
3117	3195	}
3118	3196
3119	3197	static void
3120	3198	isp_cnr_config(struct rkisp_isp_params_vdev *params_vdev,
3121		- const struct isp32_cnr_cfg *arg)
	3199	+ const struct isp32_cnr_cfg *arg, u32 id)
3122	3200	{
3123	3201	u32 i, value, ctrl, gain_ctrl;
3124	3202
3125		- gain_ctrl = isp3_param_read(params_vdev, ISP3X_GAIN_CTRL);
3126		- ctrl = isp3_param_read(params_vdev, ISP3X_CNR_CTRL);
	3203	+ gain_ctrl = isp3_param_read(params_vdev, ISP3X_GAIN_CTRL, id);
	3204	+ ctrl = isp3_param_read(params_vdev, ISP3X_CNR_CTRL, id);
3127	3205	ctrl &= ISP32_MODULE_EN;
3128	3206
3129	3207	ctrl \|= !!arg->bf3x3_wgt0_sel << 8 \|
..	..	@@ -3139,63 +3217,63 @@
3139	3217	value &= ~ISP3X_CNR_GLOBAL_GAIN_ALPHA_MAX;
3140	3218	value \|= BIT(15);
3141	3219	}
3142		- isp3_param_write(params_vdev, ctrl, ISP3X_CNR_CTRL);
3143		- isp3_param_write(params_vdev, value, ISP3X_CNR_EXGAIN);
	3220	+ isp3_param_write(params_vdev, ctrl, ISP3X_CNR_CTRL, id);
	3221	+ isp3_param_write(params_vdev, value, ISP3X_CNR_EXGAIN, id);
3144	3222
3145	3223	value = ISP_PACK_2SHORT(arg->thumb_sigma_c, arg->thumb_sigma_y);
3146		- isp3_param_write(params_vdev, value, ISP32_CNR_THUMB1);
	3224	+ isp3_param_write(params_vdev, value, ISP32_CNR_THUMB1, id);
3147	3225
3148	3226	value = arg->thumb_bf_ratio & 0x7ff;
3149		- isp3_param_write(params_vdev, value, ISP32_CNR_THUMB_BF_RATIO);
	3227	+ isp3_param_write(params_vdev, value, ISP32_CNR_THUMB_BF_RATIO, id);
3150	3228
3151	3229	value = ISP_PACK_4BYTE(arg->lbf1x7_weit_d0, arg->lbf1x7_weit_d1,
3152	3230	arg->lbf1x7_weit_d2, arg->lbf1x7_weit_d3);
3153		- isp3_param_write(params_vdev, value, ISP32_CNR_LBF_WEITD);
	3231	+ isp3_param_write(params_vdev, value, ISP32_CNR_LBF_WEITD, id);
3154	3232
3155	3233	value = (arg->wgt_slope & 0x3ff) << 20 \| (arg->exp_shift & 0x3f) << 12 \|
3156	3234	arg->iir_strength << 4 \| (arg->iir_uvgain & 0xf);
3157		- isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA1);
	3235	+ isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA1, id);
3158	3236
3159	3237	value = ISP_PACK_4BYTE(arg->chroma_ghost, arg->iir_uv_clip, 0, 0);
3160		- isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA2);
	3238	+ isp3_param_write(params_vdev, value, ISP32_CNR_IIR_PARA2, id);
3161	3239
3162	3240	value = ISP_PACK_4BYTE(arg->gaus_coe[0], arg->gaus_coe[1],
3163	3241	arg->gaus_coe[2], arg->gaus_coe[3]);
3164		- isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE1);
	3242	+ isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE1, id);
3165	3243
3166	3244	value = ISP_PACK_4BYTE(arg->gaus_coe[4], arg->gaus_coe[5], 0, 0);
3167		- isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE2);
	3245	+ isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_COE2, id);
3168	3246
3169	3247	value = (arg->global_alpha & 0x7ff) << 20 \| arg->bf_wgt_clip << 12 \|
3170	3248	(arg->gaus_ratio & 0x7ff);
3171		- isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_RATIO);
	3249	+ isp3_param_write(params_vdev, value, ISP32_CNR_GAUS_RATIO, id);
3172	3250
3173	3251	value = arg->bf_ratio << 24 \| (arg->sigma_r & 0x3fff) << 8 \|
3174	3252	(arg->uv_gain & 0x7f);
3175		- isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA1);
	3253	+ isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA1, id);
3176	3254
3177	3255	value = (arg->adj_ratio & 0x7fff) << 16 \| (arg->adj_offset & 0x1ff);
3178		- isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA2);
	3256	+ isp3_param_write(params_vdev, value, ISP32_CNR_BF_PARA2, id);
3179	3257
3180	3258	for (i = 0; i < ISP32_CNR_SIGMA_Y_NUM / 4; i++) {
3181	3259	value = ISP_PACK_4BYTE(arg->sigma_y[i * 4], arg->sigma_y[i * 4 + 1],
3182	3260	arg->sigma_y[i * 4 + 2], arg->sigma_y[i * 4 + 3]);
3183		- isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4);
	3261	+ isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4, id);
3184	3262	}
3185	3263	value = arg->sigma_y[i * 4];
3186		- isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4);
	3264	+ isp3_param_write(params_vdev, value, ISP32_CNR_SIGMA0 + i * 4, id);
3187	3265
3188	3266	value = (arg->iir_gain_alpha & 0xf) << 8 \| arg->iir_global_gain;
3189		- isp3_param_write(params_vdev, value, ISP32_CNR_IIR_GLOBAL_GAIN);
	3267	+ isp3_param_write(params_vdev, value, ISP32_CNR_IIR_GLOBAL_GAIN, id);
3190	3268	}
3191	3269
3192	3270	static void
3193		-isp_cnr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3271	+isp_cnr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3194	3272	{
3195	3273	u32 cnr_ctrl;
3196	3274	bool real_en;
3197	3275
3198		- cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL);
	3276	+ cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL, id);
3199	3277	real_en = !!(cnr_ctrl & ISP32_MODULE_EN);
3200	3278	if ((en && real_en) \|\| (!en && !real_en))
3201	3279	return;
..	..	@@ -3203,21 +3281,21 @@
3203	3281	if (en) {
3204	3282	cnr_ctrl \|= ISP32_MODULE_EN;
3205	3283	isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1,
3206		- ISP3X_CNR_FST_FRAME);
	3284	+ ISP3X_CNR_FST_FRAME, id);
3207	3285	} else {
3208	3286	cnr_ctrl &= ~ISP32_MODULE_EN;
3209	3287	}
3210	3288
3211		- isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL);
	3289	+ isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL, id);
3212	3290	}
3213	3291
3214	3292	static void
3215	3293	isp_sharp_config(struct rkisp_isp_params_vdev *params_vdev,
3216		- const struct isp32_sharp_cfg *arg)
	3294	+ const struct isp32_sharp_cfg *arg, u32 id)
3217	3295	{
3218	3296	u32 i, value;
3219	3297
3220		- value = isp3_param_read(params_vdev, ISP3X_SHARP_EN);
	3298	+ value = isp3_param_read(params_vdev, ISP3X_SHARP_EN, id);
3221	3299	value &= ISP32_MODULE_EN;
3222	3300
3223	3301	value \|= !!arg->bypass << 1 \|
..	..	@@ -3229,11 +3307,11 @@
3229	3307	else
3230	3308	value \|= !!arg->clip_hf_mode << 6 \|
3231	3309	!!arg->add_mode << 7;
3232		- isp3_param_write(params_vdev, value, ISP3X_SHARP_EN);
	3310	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EN, id);
3233	3311
3234	3312	value = ISP_PACK_4BYTE(arg->pbf_ratio, arg->gaus_ratio,
3235	3313	arg->bf_ratio, arg->sharp_ratio);
3236		- isp3_param_write(params_vdev, value, ISP3X_SHARP_RATIO);
	3314	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_RATIO, id);
3237	3315
3238	3316	value = (arg->luma_dx[6] & 0x0F) << 24 \|
3239	3317	(arg->luma_dx[5] & 0x0F) << 20 \|
..	..	@@ -3242,217 +3320,222 @@
3242	3320	(arg->luma_dx[2] & 0x0F) << 8 \|
3243	3321	(arg->luma_dx[1] & 0x0F) << 4 \|
3244	3322	(arg->luma_dx[0] & 0x0F);
3245		- isp3_param_write(params_vdev, value, ISP3X_SHARP_LUMA_DX);
	3323	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_LUMA_DX, id);
3246	3324
3247	3325	value = (arg->pbf_sigma_inv[2] & 0x3FF) << 20 \|
3248	3326	(arg->pbf_sigma_inv[1] & 0x3FF) << 10 \|
3249	3327	(arg->pbf_sigma_inv[0] & 0x3FF);
3250		- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_0);
	3328	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_0, id);
3251	3329
3252	3330	value = (arg->pbf_sigma_inv[5] & 0x3FF) << 20 \|
3253	3331	(arg->pbf_sigma_inv[4] & 0x3FF) << 10 \|
3254	3332	(arg->pbf_sigma_inv[3] & 0x3FF);
3255		- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_1);
	3333	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_1, id);
3256	3334
3257	3335	value = (arg->pbf_sigma_inv[7] & 0x3FF) << 10 \|
3258	3336	(arg->pbf_sigma_inv[6] & 0x3FF);
3259		- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_2);
	3337	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_SIGMA_INV_2, id);
3260	3338
3261	3339	value = (arg->bf_sigma_inv[2] & 0x3FF) << 20 \|
3262	3340	(arg->bf_sigma_inv[1] & 0x3FF) << 10 \|
3263	3341	(arg->bf_sigma_inv[0] & 0x3FF);
3264		- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_0);
	3342	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_0, id);
3265	3343
3266	3344	value = (arg->bf_sigma_inv[5] & 0x3FF) << 20 \|
3267	3345	(arg->bf_sigma_inv[4] & 0x3FF) << 10 \|
3268	3346	(arg->bf_sigma_inv[3] & 0x3FF);
3269		- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_1);
	3347	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_1, id);
3270	3348
3271	3349	value = (arg->bf_sigma_inv[7] & 0x3FF) << 10 \|
3272	3350	(arg->bf_sigma_inv[6] & 0x3FF);
3273		- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_2);
	3351	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_SIGMA_INV_2, id);
3274	3352
3275	3353	value = (arg->bf_sigma_shift & 0x0F) << 4 \|
3276	3354	(arg->pbf_sigma_shift & 0x0F);
3277		- isp3_param_write(params_vdev, value, ISP3X_SHARP_SIGMA_SHIFT);
	3355	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_SIGMA_SHIFT, id);
3278	3356
3279	3357	value = (arg->clip_hf[2] & 0x3FF) << 20 \|
3280	3358	(arg->clip_hf[1] & 0x3FF) << 10 \|
3281	3359	(arg->clip_hf[0] & 0x3FF);
3282		- isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_0);
	3360	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_0, id);
3283	3361
3284	3362	value = (arg->clip_hf[5] & 0x3FF) << 20 \|
3285	3363	(arg->clip_hf[4] & 0x3FF) << 10 \|
3286	3364	(arg->clip_hf[3] & 0x3FF);
3287		- isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_1);
	3365	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_1, id);
3288	3366
3289	3367	value = (arg->clip_hf[7] & 0x3FF) << 10 \|
3290	3368	(arg->clip_hf[6] & 0x3FF);
3291		- isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_2);
	3369	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_CLIP_HF_2, id);
3292	3370
3293	3371	value = ISP_PACK_4BYTE(arg->pbf_coef0, arg->pbf_coef1, arg->pbf_coef2, 0);
3294		- isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_COEF);
	3372	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_PBF_COEF, id);
3295	3373
3296	3374	value = ISP_PACK_4BYTE(arg->bf_coef0, arg->bf_coef1, arg->bf_coef2, 0);
3297		- isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_COEF);
	3375	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_BF_COEF, id);
3298	3376
3299	3377	value = ISP_PACK_4BYTE(arg->gaus_coef[0], arg->gaus_coef[1], arg->gaus_coef[2], 0);
3300		- isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF0);
	3378	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF0, id);
3301	3379
3302	3380	value = ISP_PACK_4BYTE(arg->gaus_coef[3], arg->gaus_coef[4], arg->gaus_coef[5], 0);
3303		- isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF1);
	3381	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_GAUS_COEF1, id);
3304	3382
3305	3383	value = arg->local_gainscale << 24 \| (arg->global_gain_alpha & 0xf) << 16 \|
3306	3384	(arg->global_gain & 0x3ff);
3307		- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN);
	3385	+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN, id);
3308	3386
3309	3387	for (i = 0; i < ISP32_SHARP_GAIN_ADJ_NUM / 2; i++) {
3310	3388	value = ISP_PACK_2SHORT(arg->gain_adj[i * 2], arg->gain_adj[i * 2 + 1]);
3311		- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_ADJUST0 + i * 4);
	3389	+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_ADJUST0 + i * 4, id);
3312	3390	}
3313	3391
3314	3392	value = ISP_PACK_2SHORT(arg->center_wid, arg->center_het);
3315		- isp3_param_write(params_vdev, value, ISP32_SHARP_CENTER);
	3393	+ isp3_param_write(params_vdev, value, ISP32_SHARP_CENTER, id);
3316	3394
3317	3395	for (i = 0; i < ISP32_SHARP_STRENGTH_NUM / 4; i++) {
3318	3396	value = ISP_PACK_4BYTE(arg->strength[i * 4], arg->strength[i * 4 + 1],
3319	3397	arg->strength[i * 4 + 2], arg->strength[i * 4 + 3]);
3320		- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4);
	3398	+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4, id);
3321	3399	}
3322	3400	value = ISP_PACK_4BYTE(arg->strength[i * 4], arg->strength[i * 4 + 1], 0, 0);
3323		- isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4);
	3401	+ isp3_param_write(params_vdev, value, ISP32_SHARP_GAIN_DIS_STRENGTH0 + i * 4, id);
3324	3402
3325	3403	if (params_vdev->dev->isp_ver == ISP_V32) {
3326	3404	value = (arg->noise_strength & 0x3fff) << 16 \| (arg->enhance_bit & 0xf) << 12 \|
3327	3405	(arg->noise_sigma & 0x3ff);
3328		- isp3_param_write(params_vdev, value, ISP32_SHARP_TEXTURE);
	3406	+ isp3_param_write(params_vdev, value, ISP32_SHARP_TEXTURE, id);
3329	3407	} else {
3330	3408	value = (arg->ehf_th[2] & 0x3FF) << 20 \|
3331	3409	(arg->ehf_th[1] & 0x3FF) << 10 \|
3332	3410	(arg->ehf_th[0] & 0x3FF);
3333		- isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_0);
	3411	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_0, id);
3334	3412	value = (arg->ehf_th[5] & 0x3FF) << 20 \|
3335	3413	(arg->ehf_th[4] & 0x3FF) << 10 \|
3336	3414	(arg->ehf_th[3] & 0x3FF);
3337		- isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_1);
	3415	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_1, id);
3338	3416	value = (arg->ehf_th[7] & 0x3FF) << 10 \|
3339	3417	(arg->ehf_th[6] & 0x3FF);
3340		- isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_2);
	3418	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EHF_TH_2, id);
3341	3419
3342	3420	value = (arg->clip_neg[2] & 0x3FF) << 20 \|
3343	3421	(arg->clip_neg[1] & 0x3FF) << 10 \|
3344	3422	(arg->clip_neg[0] & 0x3FF);
3345		- isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_0);
	3423	+ isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_0, id);
3346	3424	value = (arg->clip_neg[5] & 0x3FF) << 20 \|
3347	3425	(arg->clip_neg[4] & 0x3FF) << 10 \|
3348	3426	(arg->clip_neg[3] & 0x3FF);
3349		- isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_1);
	3427	+ isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_1, id);
3350	3428	value = (arg->clip_neg[7] & 0x3FF) << 10 \|
3351	3429	(arg->clip_neg[6] & 0x3FF);
3352		- isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_2);
	3430	+ isp3_param_write(params_vdev, value, ISP32L_SHARP_CLIP_NEG_2, id);
3353	3431	}
3354	3432	}
3355	3433
3356	3434	static void
3357		-isp_sharp_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3435	+isp_sharp_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3358	3436	{
3359	3437	u32 value;
3360	3438
3361		- value = isp3_param_read_cache(params_vdev, ISP3X_SHARP_EN);
	3439	+ value = isp3_param_read_cache(params_vdev, ISP3X_SHARP_EN, id);
	3440	+ if ((en && (value & ISP32_MODULE_EN)) \|\|
	3441	+ (!en && !(value & ISP32_MODULE_EN)))
	3442	+ return;
	3443	+
3362	3444	value &= ~ISP32_MODULE_EN;
3363		-
3364		- if (en)
	3445	+ if (en) {
	3446	+ isp3_param_set_bits(params_vdev,
	3447	+ ISP3X_ISP_CTRL1, ISP32_SHP_FST_FRAME, id);
3365	3448	value \|= ISP32_MODULE_EN;
3366		-
3367		- isp3_param_write(params_vdev, value, ISP3X_SHARP_EN);
	3449	+ }
	3450	+ isp3_param_write(params_vdev, value, ISP3X_SHARP_EN, id);
3368	3451	}
3369	3452
3370	3453	static void
3371	3454	isp_baynr_config(struct rkisp_isp_params_vdev *params_vdev,
3372		- const struct isp32_baynr_cfg *arg)
	3455	+ const struct isp32_baynr_cfg *arg, u32 id)
3373	3456	{
3374	3457	u32 i, value;
3375	3458
3376		- value = isp3_param_read(params_vdev, ISP3X_BAYNR_CTRL);
	3459	+ value = isp3_param_read(params_vdev, ISP3X_BAYNR_CTRL, id);
3377	3460	value &= ISP32_MODULE_EN;
3378	3461
3379	3462	value \|= !!arg->bay3d_gain_en << 16 \|
3380	3463	(arg->lg2_mode & 0x3) << 12 \|
3381	3464	!!arg->gauss_en << 8 \|
3382	3465	!!arg->log_bypass << 4;
3383		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL);
	3466	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL, id);
3384	3467
3385	3468	value = ISP_PACK_2SHORT(arg->dgain0, arg->dgain1);
3386		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_DGAIN0);
	3469	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_DGAIN0, id);
3387	3470
3388		- isp3_param_write(params_vdev, arg->dgain2, ISP3X_BAYNR_DGAIN1);
3389		- isp3_param_write(params_vdev, arg->pix_diff, ISP3X_BAYNR_PIXDIFF);
	3471	+ isp3_param_write(params_vdev, arg->dgain2, ISP3X_BAYNR_DGAIN1, id);
	3472	+ isp3_param_write(params_vdev, arg->pix_diff, ISP3X_BAYNR_PIXDIFF, id);
3390	3473
3391	3474	value = ISP_PACK_2SHORT(arg->softthld, arg->diff_thld);
3392		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_THLD);
	3475	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_THLD, id);
3393	3476
3394	3477	value = ISP_PACK_2SHORT(arg->reg_w1, arg->bltflt_streng);
3395		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_W1_STRENG);
	3478	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_W1_STRENG, id);
3396	3479
3397	3480	for (i = 0; i < ISP32_BAYNR_XY_NUM / 2; i++) {
3398	3481	value = ISP_PACK_2SHORT(arg->sigma_x[2 * i], arg->sigma_x[2 * i + 1]);
3399		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAX01 + 4 * i);
	3482	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAX01 + 4 * i, id);
3400	3483	}
3401	3484
3402	3485	for (i = 0; i < ISP32_BAYNR_XY_NUM / 2; i++) {
3403	3486	value = ISP_PACK_2SHORT(arg->sigma_y[2 * i], arg->sigma_y[2 * i + 1]);
3404		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAY01 + 4 * i);
	3487	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_SIGMAY01 + 4 * i, id);
3405	3488	}
3406	3489
3407	3490	value = (arg->weit_d2 & 0x3FF) << 20 \|
3408	3491	(arg->weit_d1 & 0x3FF) << 10 \|
3409	3492	(arg->weit_d0 & 0x3FF);
3410		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_WRIT_D);
	3493	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_WRIT_D, id);
3411	3494
3412	3495	value = ISP_PACK_2SHORT(arg->lg2_off, arg->lg2_lgoff);
3413		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_LG_OFF);
	3496	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_LG_OFF, id);
3414	3497
3415	3498	value = arg->dat_max & 0xfffff;
3416		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_DAT_MAX);
	3499	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_DAT_MAX, id);
3417	3500
3418	3501	value = ISP_PACK_2SHORT(arg->rgain_off, arg->bgain_off);
3419		- isp3_param_write(params_vdev, value, ISP32_BAYNR_SIGOFF);
	3502	+ isp3_param_write(params_vdev, value, ISP32_BAYNR_SIGOFF, id);
3420	3503
3421	3504	for (i = 0; i < ISP32_BAYNR_GAIN_NUM / 4; i++) {
3422	3505	value = ISP_PACK_4BYTE(arg->gain_x[i * 4], arg->gain_x[i * 4 + 1],
3423	3506	arg->gain_x[i * 4 + 2], arg->gain_x[i * 4 + 3]);
3424		- isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINX03 + i * 4);
	3507	+ isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINX03 + i * 4, id);
3425	3508	}
3426	3509
3427	3510	for (i = 0; i < ISP32_BAYNR_GAIN_NUM / 2; i++) {
3428	3511	value = ISP_PACK_2SHORT(arg->gain_y[i * 2], arg->gain_y[i * 2 + 1]);
3429		- isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINY01 + i * 4);
	3512	+ isp3_param_write(params_vdev, value, ISP32_BAYNR_GAINY01 + i * 4, id);
3430	3513	}
3431	3514	}
3432	3515
3433	3516	static void
3434		-isp_baynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3517	+isp_baynr_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3435	3518	{
3436	3519	u32 value;
3437	3520
3438		- value = isp3_param_read_cache(params_vdev, ISP3X_BAYNR_CTRL);
	3521	+ value = isp3_param_read_cache(params_vdev, ISP3X_BAYNR_CTRL, id);
3439	3522	value &= ~ISP32_MODULE_EN;
3440	3523
3441	3524	if (en)
3442	3525	value \|= ISP32_MODULE_EN;
3443	3526
3444		- isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL);
	3527	+ isp3_param_write(params_vdev, value, ISP3X_BAYNR_CTRL, id);
3445	3528	}
3446	3529
3447	3530	static void
3448	3531	isp_bay3d_config(struct rkisp_isp_params_vdev *params_vdev,
3449		- const struct isp32_bay3d_cfg *arg)
	3532	+ const struct isp32_bay3d_cfg *arg, u32 id)
3450	3533	{
3451	3534	struct rkisp_isp_params_val_v32 *priv_val;
3452	3535	u32 i, value;
3453	3536
3454	3537	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
3455		- value = isp3_param_read(params_vdev, ISP3X_BAY3D_CTRL);
	3538	+ value = isp3_param_read(params_vdev, ISP3X_BAY3D_CTRL, id);
3456	3539	value &= (ISP32_MODULE_EN \| ISP32_BAY3D_BWSAVING(1));
3457	3540
3458	3541	value \|= !!arg->loswitch_protect << 12 \|
..	..	@@ -3478,7 +3561,7 @@
3478	3561	"bwsaving to %d no support change for bay3d en\n",
3479	3562	arg->bwsaving_en);
3480	3563	}
3481		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_CTRL);
	3564	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_CTRL, id);
3482	3565
3483	3566	value = !!arg->wgtmix_opt_en << 12 \|
3484	3567	!!arg->curds_high_en << 8 \|
..	..	@@ -3500,72 +3583,72 @@
3500	3583	value &= ~(BIT(3) \| BIT(4));
3501	3584	else if (!(value & (BIT(3) \| BIT(4))))
3502	3585	value \|= BIT(3);
3503		- isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1);
	3586	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1, id);
3504	3587
3505	3588	value = ISP_PACK_2SHORT(arg->softwgt, arg->hidif_th);
3506		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_KALRATIO);
	3589	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_KALRATIO, id);
3507	3590
3508		- isp3_param_write(params_vdev, arg->glbpk2, ISP3X_BAY3D_GLBPK2);
	3591	+ isp3_param_write(params_vdev, arg->glbpk2, ISP3X_BAY3D_GLBPK2, id);
3509	3592
3510	3593	value = ISP_PACK_2SHORT(arg->wgtlmt, arg->wgtratio);
3511		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_WGTLMT);
	3594	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_WGTLMT, id);
3512	3595
3513	3596	for (i = 0; i < ISP32_BAY3D_XY_NUM / 2; i++) {
3514	3597	value = ISP_PACK_2SHORT(arg->sig0_x[2 * i],
3515	3598	arg->sig0_x[2 * i + 1]);
3516		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_X0 + 4 * i);
	3599	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_X0 + 4 * i, id);
3517	3600
3518	3601	value = ISP_PACK_2SHORT(arg->sig1_x[2 * i],
3519	3602	arg->sig1_x[2 * i + 1]);
3520		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_X0 + 4 * i);
	3603	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_X0 + 4 * i, id);
3521	3604	}
3522	3605
3523	3606	for (i = 0; i < ISP32_BAY3D_XY_NUM / 2; i++) {
3524	3607	value = ISP_PACK_2SHORT(arg->sig0_y[2 * i],
3525	3608	arg->sig0_y[2 * i + 1]);
3526		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_Y0 + 4 * i);
	3609	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG0_Y0 + 4 * i, id);
3527	3610
3528	3611	value = ISP_PACK_2SHORT(arg->sig1_y[2 * i],
3529	3612	arg->sig1_y[2 * i + 1]);
3530		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_Y0 + 4 * i);
	3613	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG1_Y0 + 4 * i, id);
3531	3614
3532	3615	value = ISP_PACK_2SHORT(arg->sig2_y[2 * i],
3533	3616	arg->sig2_y[2 * i + 1]);
3534		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG2_Y0 + 4 * i);
	3617	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_SIG2_Y0 + 4 * i, id);
3535	3618	}
3536	3619
3537	3620	if (params_vdev->dev->isp_ver == ISP_V32_L) {
3538	3621	value = ISP_PACK_2SHORT(0, arg->wgtmin);
3539		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_LODIF_STAT1);
	3622	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_LODIF_STAT1, id);
3540	3623	}
3541	3624
3542	3625	value = ISP_PACK_2SHORT(arg->hisigrat0, arg->hisigrat1);
3543		- isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGRAT);
	3626	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGRAT, id);
3544	3627
3545	3628	value = ISP_PACK_2SHORT(arg->hisigoff0, arg->hisigoff1);
3546		- isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGOFF);
	3629	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_HISIGOFF, id);
3547	3630
3548	3631	value = ISP_PACK_2SHORT(arg->losigoff, arg->losigrat);
3549		- isp3_param_write(params_vdev, value, ISP32_BAY3D_LOSIG);
	3632	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_LOSIG, id);
3550	3633
3551	3634	value = ISP_PACK_2SHORT(arg->rgain_off, arg->bgain_off);
3552		- isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGPK);
	3635	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGPK, id);
3553	3636
3554	3637	value = ISP_PACK_4BYTE(arg->siggaus0, arg->siggaus1, arg->siggaus2, 0);
3555	3638	if (params_vdev->dev->isp_ver == ISP_V32)
3556	3639	value \|= (arg->siggaus3 << 24);
3557		- isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGGAUS);
	3640	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_SIGGAUS, id);
3558	3641	}
3559	3642
3560	3643	static void
3561		-isp_bay3d_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3644	+isp_bay3d_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3562	3645	{
3563	3646	struct rkisp_device *ispdev = params_vdev->dev;
3564	3647	struct rkisp_isp_params_val_v32 *priv_val;
3565	3648	u32 value, bay3d_ctrl;
3566	3649
3567	3650	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
3568		- bay3d_ctrl = isp3_param_read_cache(params_vdev, ISP3X_BAY3D_CTRL);
	3651	+ bay3d_ctrl = isp3_param_read_cache(params_vdev, ISP3X_BAY3D_CTRL, id);
3569	3652	if ((en && (bay3d_ctrl & ISP32_MODULE_EN)) \|\|
3570	3653	(!en && !(bay3d_ctrl & ISP32_MODULE_EN)))
3571	3654	return;
..	..	@@ -3576,85 +3659,85 @@
3576	3659	return;
3577	3660	}
3578	3661
3579		- value = priv_val->buf_3dnr_iir.size;
3580		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_SIZE);
3581		- value = priv_val->buf_3dnr_iir.dma_addr;
3582		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_BASE);
3583		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_RD_BASE);
	3662	+ value = priv_val->bay3d_iir_size;
	3663	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_SIZE, id);
	3664	+ value = priv_val->buf_3dnr_iir.dma_addr + value * id;
	3665	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_WR_BASE, id);
	3666	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_IIR_RD_BASE, id);
3584	3667
3585		- value = priv_val->buf_3dnr_ds.size;
3586		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_SIZE);
3587		- value = priv_val->buf_3dnr_ds.dma_addr;
3588		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_BASE);
3589		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_RD_BASE);
	3668	+ value = priv_val->bay3d_ds_size;
	3669	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_SIZE, id);
	3670	+ value = priv_val->buf_3dnr_ds.dma_addr + value * id;
	3671	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_WR_BASE, id);
	3672	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_DS_RD_BASE, id);
3590	3673
3591	3674	value = priv_val->is_sram ?
3592	3675	ispdev->hw_dev->sram.dma_addr : priv_val->buf_3dnr_cur.dma_addr;
3593		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_BASE);
3594		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_BASE);
	3676	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_BASE, id);
	3677	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_BASE, id);
3595	3678	value = priv_val->bay3d_cur_size;
3596		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_SIZE);
3597		- isp3_param_write(params_vdev, value, ISP32_MI_BAY3D_CUR_RD_SIZE);
	3679	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_SIZE, id);
	3680	+ isp3_param_write(params_vdev, value, ISP32_MI_BAY3D_CUR_RD_SIZE, id);
3598	3681	value = priv_val->bay3d_cur_wsize;
3599		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_LENGTH);
3600		- isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_LENGTH);
	3682	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_WR_LENGTH, id);
	3683	+ isp3_param_write(params_vdev, value, ISP3X_MI_BAY3D_CUR_RD_LENGTH, id);
3601	3684	value = priv_val->bay3d_cur_wrap_line << 16 \|
3602	3685	(ispdev->isp_ver == ISP_V32 ? 28 : 20);
3603		- isp3_param_write(params_vdev, value, ISP3X_BAY3D_MI_ST);
	3686	+ isp3_param_write(params_vdev, value, ISP3X_BAY3D_MI_ST, id);
3604	3687
3605	3688	/* mibuf_size for fifo_cur_full, set to max: (3072 - 2) / 2, 2 align */
3606	3689	if (ispdev->isp_ver == ISP_V32) {
3607	3690	value = 0x5fe << 16;
3608		- isp3_param_set_bits(params_vdev, ISP3X_BAY3D_IN_IRQ_LINECNT, value);
	3691	+ isp3_param_set_bits(params_vdev, ISP3X_BAY3D_IN_IRQ_LINECNT, value, id);
3609	3692	}
3610	3693
3611		- value = isp3_param_read_cache(params_vdev, ISP32_BAY3D_CTRL1);
	3694	+ value = isp3_param_read_cache(params_vdev, ISP32_BAY3D_CTRL1, id);
3612	3695	if (priv_val->is_lo8x8) {
3613	3696	if (value & (BIT(3) \| BIT(4))) {
3614	3697	value &= ~(BIT(3) \| BIT(4));
3615		- isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1);
	3698	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1, id);
3616	3699	}
3617	3700	} else if (!(value & (BIT(3) \| BIT(4)))) {
3618	3701	value \|= BIT(3);
3619		- isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1);
	3702	+ isp3_param_write(params_vdev, value, ISP32_BAY3D_CTRL1, id);
3620	3703	}
3621	3704	bay3d_ctrl \|= ISP32_MODULE_EN;
3622		- isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL);
	3705	+ isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL, id);
3623	3706
3624	3707	value = ISP3X_BAY3D_IIR_WR_AUTO_UPD \| ISP3X_BAY3D_CUR_WR_AUTO_UPD \|
3625	3708	ISP3X_BAY3D_DS_WR_AUTO_UPD \| ISP3X_BAY3D_IIRSELF_UPD \|
3626	3709	ISP3X_BAY3D_CURSELF_UPD \| ISP3X_BAY3D_DSSELF_UPD \|
3627	3710	ISP3X_BAY3D_RDSELF_UPD;
3628		- isp3_param_set_bits(params_vdev, MI_WR_CTRL2, value);
	3711	+ isp3_param_set_bits(params_vdev, MI_WR_CTRL2, value, id);
3629	3712
3630		- isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1, ISP3X_RAW3D_FST_FRAME);
	3713	+ isp3_param_set_bits(params_vdev, ISP3X_ISP_CTRL1, ISP3X_RAW3D_FST_FRAME, id);
3631	3714	} else {
3632	3715	bay3d_ctrl &= ~ISP32_MODULE_EN;
3633		- isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL);
3634		- isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(4));
	3716	+ isp3_param_write(params_vdev, bay3d_ctrl, ISP3X_BAY3D_CTRL, id);
	3717	+ isp3_param_clear_bits(params_vdev, ISP3X_GAIN_CTRL, BIT(4), id);
3635	3718	}
3636	3719	}
3637	3720
3638	3721	static void
3639	3722	isp_gain_config(struct rkisp_isp_params_vdev *params_vdev,
3640		- const struct isp3x_gain_cfg *arg)
	3723	+ const struct isp3x_gain_cfg *arg, u32 id)
3641	3724	{
3642	3725	u32 val;
3643	3726
3644	3727	val = arg->g0 & 0x3ffff;
3645		- isp3_param_write(params_vdev, val, ISP3X_GAIN_G0);
	3728	+ isp3_param_write(params_vdev, val, ISP3X_GAIN_G0, id);
3646	3729	val = ISP_PACK_2SHORT(arg->g1, arg->g2);
3647		- isp3_param_write(params_vdev, val, ISP3X_GAIN_G1_G2);
	3730	+ isp3_param_write(params_vdev, val, ISP3X_GAIN_G1_G2, id);
3648	3731	}
3649	3732
3650	3733	static void
3651		-isp_gain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3734	+isp_gain_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3652	3735	{
3653	3736	struct rkisp_isp_params_val_v32 *priv_val =
3654	3737	(struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
3655	3738	u32 val = 0;
3656	3739
3657		- val = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL);
	3740	+ val = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL, id);
3658	3741	if (en) {
3659	3742	if (params_vdev->dev->isp_ver == ISP_V32) {
3660	3743	val \|= priv_val->lut3d_en << 20 \|
..	..	@@ -3662,7 +3745,7 @@
3662	3745	priv_val->drc_en << 12 \|
3663	3746	priv_val->lsc_en << 8 \|
3664	3747	priv_val->bay3d_en << 4;
3665		- if (isp3_param_read(params_vdev, ISP3X_HDRMGE_CTRL) & BIT(0))
	3748	+ if (isp3_param_read(params_vdev, ISP3X_HDRMGE_CTRL, id) & BIT(0))
3666	3749	val \|= BIT(1);
3667	3750	if (val)
3668	3751	val \|= ISP32_MODULE_EN;
..	..	@@ -3670,12 +3753,12 @@
3670	3753	val \|= ISP32_MODULE_EN;
3671	3754	}
3672	3755	}
3673		- isp3_param_write(params_vdev, val, ISP3X_GAIN_CTRL);
	3756	+ isp3_param_write(params_vdev, val, ISP3X_GAIN_CTRL, id);
3674	3757	}
3675	3758
3676	3759	static void
3677	3760	isp_cac_config(struct rkisp_isp_params_vdev *params_vdev,
3678		- const struct isp32_cac_cfg *arg)
	3761	+ const struct isp32_cac_cfg *arg, u32 id)
3679	3762	{
3680	3763	struct rkisp_device *dev = params_vdev->dev;
3681	3764	struct rkisp_isp_params_val_v32 *priv_val;
..	..	@@ -3684,7 +3767,7 @@
3684	3767
3685	3768	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
3686	3769
3687		- ctrl = isp3_param_read(params_vdev, ISP3X_CAC_CTRL);
	3770	+ ctrl = isp3_param_read(params_vdev, ISP3X_CAC_CTRL, id);
3688	3771	ctrl &= ISP3X_CAC_EN;
3689	3772	ctrl \|= !!arg->bypass_en << 1 \| !!arg->center_en << 3 \|
3690	3773	(arg->clip_g_mode & 0x3) << 5 \| !!arg->edge_detect_en << 7 \|
..	..	@@ -3692,38 +3775,38 @@
3692	3775
3693	3776	val = (arg->psf_sft_bit & 0xff) \|
3694	3777	(arg->cfg_num & 0x7ff) << 8;
3695		- isp3_param_write(params_vdev, val, ISP3X_CAC_PSF_PARA);
	3778	+ isp3_param_write(params_vdev, val, ISP3X_CAC_PSF_PARA, id);
3696	3779
3697	3780	val = ISP_PACK_2SHORT(arg->center_width, arg->center_height);
3698		- isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH_CENTER);
	3781	+ isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH_CENTER, id);
3699	3782
3700	3783	for (i = 0; i < ISP32_CAC_STRENGTH_NUM / 2; i++) {
3701	3784	val = ISP_PACK_2SHORT(arg->strength[2 * i], arg->strength[2 * i + 1]);
3702		- isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH0 + i * 4);
	3785	+ isp3_param_write(params_vdev, val, ISP3X_CAC_STRENGTH0 + i * 4, id);
3703	3786	}
3704	3787
3705	3788	val = (arg->flat_thed_r & 0x1f) << 8 \| (arg->flat_thed_b & 0x1f);
3706		- isp3_param_write(params_vdev, val, ISP32_CAC_FLAT_THED);
	3789	+ isp3_param_write(params_vdev, val, ISP32_CAC_FLAT_THED, id);
3707	3790
3708	3791	val = ISP_PACK_2SHORT(arg->offset_b, arg->offset_r);
3709		- isp3_param_write(params_vdev, val, ISP32_CAC_OFFSET);
	3792	+ isp3_param_write(params_vdev, val, ISP32_CAC_OFFSET, id);
3710	3793
3711	3794	val = arg->expo_thed_b & 0x1fffff;
3712		- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_B);
	3795	+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_B, id);
3713	3796
3714	3797	val = arg->expo_thed_r & 0x1fffff;
3715		- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_R);
	3798	+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_THED_R, id);
3716	3799
3717	3800	val = arg->expo_adj_b & 0xfffff;
3718		- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_B);
	3801	+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_B, id);
3719	3802
3720	3803	val = arg->expo_adj_r & 0xfffff;
3721		- isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_R);
	3804	+ isp3_param_write(params_vdev, val, ISP32_CAC_EXPO_ADJ_R, id);
3722	3805
3723	3806	for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
3724		- if (!priv_val->buf_cac[i].mem_priv)
	3807	+ if (!priv_val->buf_cac[id][i].mem_priv)
3725	3808	continue;
3726		- if (arg->buf_fd == priv_val->buf_cac[i].dma_fd)
	3809	+ if (arg->buf_fd == priv_val->buf_cac[id][i].dma_fd)
3727	3810	break;
3728	3811	}
3729	3812
..	..	@@ -3732,44 +3815,53 @@
3732	3815	return;
3733	3816	}
3734	3817
3735		- if (!priv_val->buf_cac[i].vaddr) {
	3818	+ if (!priv_val->buf_cac[id][i].vaddr) {
3736	3819	dev_err(dev->dev, "no cac buffer allocated\n");
3737	3820	return;
3738	3821	}
3739	3822
3740		- val = priv_val->buf_cac_idx;
3741		- head = (struct isp2x_mesh_head *)priv_val->buf_cac[val].vaddr;
	3823	+ val = priv_val->buf_cac_idx[id];
	3824	+ head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][val].vaddr;
3742	3825	head->stat = MESH_BUF_INIT;
3743	3826
3744		- head = (struct isp2x_mesh_head *)priv_val->buf_cac[i].vaddr;
	3827	+ head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][i].vaddr;
3745	3828	head->stat = MESH_BUF_CHIPINUSE;
3746		- priv_val->buf_cac_idx = i;
3747		- rkisp_prepare_buffer(dev, &priv_val->buf_cac[i]);
3748		- val = priv_val->buf_cac[i].dma_addr + head->data_oft;
3749		- isp3_param_write(params_vdev, val, ISP3X_MI_LUT_CAC_RD_BASE);
3750		- isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_CAC_RD_H_WSIZE);
3751		- isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_CAC_RD_V_SIZE);
	3829	+ priv_val->buf_cac_idx[id] = i;
	3830	+ rkisp_prepare_buffer(dev, &priv_val->buf_cac[id][i]);
	3831	+ val = priv_val->buf_cac[id][i].dma_addr + head->data_oft;
	3832	+ isp3_param_write(params_vdev, val, ISP3X_MI_LUT_CAC_RD_BASE, id);
	3833	+ isp3_param_write(params_vdev, arg->hsize, ISP3X_MI_LUT_CAC_RD_H_WSIZE, id);
	3834	+ isp3_param_write(params_vdev, arg->vsize, ISP3X_MI_LUT_CAC_RD_V_SIZE, id);
3752	3835	if (ctrl & ISP3X_CAC_EN)
3753	3836	ctrl \|= ISP3X_CAC_LUT_EN \| ISP32_SELF_FORCE_UPD \| ISP3X_CAC_LUT_MODE(3);
3754		- isp3_param_write(params_vdev, ctrl, ISP3X_CAC_CTRL);
	3837	+ isp3_param_write(params_vdev, ctrl, ISP3X_CAC_CTRL, id);
3755	3838	}
3756	3839
3757	3840	static void
3758		-isp_cac_enable(struct rkisp_isp_params_vdev *params_vdev, bool en)
	3841	+isp_cac_enable(struct rkisp_isp_params_vdev *params_vdev, bool en, u32 id)
3759	3842	{
	3843	+ struct rkisp_device *dev = params_vdev->dev;
	3844	+ struct rkisp_isp_params_val_v32 *priv_val;
3760	3845	u32 val;
3761	3846
3762		- val = isp3_param_read(params_vdev, ISP3X_CAC_CTRL);
	3847	+ priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
	3848	+ val = priv_val->buf_cac_idx[id];
	3849	+ if (en && !priv_val->buf_cac[id][val].vaddr) {
	3850	+ dev_err(dev->dev, "no cac buffer allocated\n");
	3851	+ return;
	3852	+ }
	3853	+
	3854	+ val = isp3_param_read(params_vdev, ISP3X_CAC_CTRL, id);
3763	3855	val &= ~(ISP3X_CAC_EN \| ISP3X_CAC_LUT_EN \| ISP32_SELF_FORCE_UPD);
3764	3856	if (en)
3765	3857	val \|= ISP3X_CAC_EN \| ISP3X_CAC_LUT_EN \|
3766	3858	ISP32_SELF_FORCE_UPD \| ISP3X_CAC_LUT_MODE(3);
3767		- isp3_param_write(params_vdev, val, ISP3X_CAC_CTRL);
	3859	+ isp3_param_write(params_vdev, val, ISP3X_CAC_CTRL, id);
3768	3860	}
3769	3861
3770	3862	static void
3771	3863	isp_csm_config(struct rkisp_isp_params_vdev *params_vdev,
3772		- const struct isp21_csm_cfg *arg)
	3864	+ const struct isp21_csm_cfg *arg, u32 id)
3773	3865	{
3774	3866	u32 i, val;
3775	3867
..	..	@@ -3780,19 +3872,19 @@
3780	3872	(arg->csm_coeff[i] & 0x1ff);
3781	3873	else
3782	3874	val = arg->csm_coeff[i] & 0x1ff;
3783		- isp3_param_write(params_vdev, val, ISP3X_ISP_CC_COEFF_0 + i * 4);
	3875	+ isp3_param_write(params_vdev, val, ISP3X_ISP_CC_COEFF_0 + i * 4, id);
3784	3876	}
3785	3877
3786		- val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
	3878	+ val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
3787	3879	val \|= CIF_ISP_CTRL_ISP_CSM_Y_FULL_ENA \| CIF_ISP_CTRL_ISP_CSM_C_FULL_ENA;
3788		- isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0);
	3880	+ isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0, id);
3789	3881	}
3790	3882
3791	3883	static void
3792	3884	isp_cgc_config(struct rkisp_isp_params_vdev *params_vdev,
3793		- const struct isp21_cgc_cfg *arg)
	3885	+ const struct isp21_cgc_cfg *arg, u32 id)
3794	3886	{
3795		- u32 val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0);
	3887	+ u32 val = isp3_param_read_cache(params_vdev, ISP3X_ISP_CTRL0, id);
3796	3888	u32 eff_ctrl, cproc_ctrl;
3797	3889
3798	3890	params_vdev->quantization = V4L2_QUANTIZATION_FULL_RANGE;
..	..	@@ -3803,31 +3895,31 @@
3803	3895	}
3804	3896	if (arg->ratio_en)
3805	3897	val \|= ISP3X_SW_CGC_RATIO_EN;
3806		- isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0);
	3898	+ isp3_param_write(params_vdev, val, ISP3X_ISP_CTRL0, id);
3807	3899
3808		- cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL);
	3900	+ cproc_ctrl = isp3_param_read(params_vdev, ISP3X_CPROC_CTRL, id);
3809	3901	if (cproc_ctrl & CIF_C_PROC_CTR_ENABLE) {
3810	3902	val = CIF_C_PROC_YOUT_FULL \| CIF_C_PROC_YIN_FULL \| CIF_C_PROC_COUT_FULL;
3811	3903	if (arg->yuv_limit)
3812	3904	cproc_ctrl &= ~val;
3813	3905	else
3814	3906	cproc_ctrl \|= val;
3815		- isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL);
	3907	+ isp3_param_write(params_vdev, cproc_ctrl, ISP3X_CPROC_CTRL, id);
3816	3908	}
3817	3909
3818		- eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL);
	3910	+ eff_ctrl = isp3_param_read(params_vdev, ISP3X_IMG_EFF_CTRL, id);
3819	3911	if (eff_ctrl & CIF_IMG_EFF_CTRL_ENABLE) {
3820	3912	if (arg->yuv_limit)
3821	3913	eff_ctrl &= ~CIF_IMG_EFF_CTRL_YCBCR_FULL;
3822	3914	else
3823	3915	eff_ctrl \|= CIF_IMG_EFF_CTRL_YCBCR_FULL;
3824		- isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL);
	3916	+ isp3_param_write(params_vdev, eff_ctrl, ISP3X_IMG_EFF_CTRL, id);
3825	3917	}
3826	3918	}
3827	3919
3828	3920	static void
3829	3921	isp_vsm_config(struct rkisp_isp_params_vdev *params_vdev,
3830		- const struct isp32_vsm_cfg *arg)
	3922	+ const struct isp32_vsm_cfg *arg, u32 id)
3831	3923	{
3832	3924	struct rkisp_device *ispdev = params_vdev->dev;
3833	3925	struct v4l2_rect *out_crop = &ispdev->isp_sdev.out_crop;
..	..	@@ -3836,38 +3928,38 @@
3836	3928	u32 val, h, v;
3837	3929
3838	3930	val = arg->h_offs;
3839		- isp3_param_write(params_vdev, val, ISP32_VSM_H_OFFS);
	3931	+ isp3_param_write(params_vdev, val, ISP32_VSM_H_OFFS, id);
3840	3932	val = arg->v_offs;
3841		- isp3_param_write(params_vdev, val, ISP32_VSM_V_OFFS);
	3933	+ isp3_param_write(params_vdev, val, ISP32_VSM_V_OFFS, id);
3842	3934
3843	3935	h = arg->h_size;
3844	3936	if (h > width - arg->h_offs)
3845	3937	h = width - arg->h_offs;
3846	3938	h &= ~1;
3847		- isp3_param_write(params_vdev, h, ISP32_VSM_H_SIZE);
	3939	+ isp3_param_write(params_vdev, h, ISP32_VSM_H_SIZE, id);
3848	3940
3849	3941	v = arg->v_size;
3850	3942	if (v > height - arg->v_offs)
3851	3943	v = height - arg->v_offs;
3852	3944	v &= ~1;
3853		- isp3_param_write(params_vdev, v, ISP32_VSM_V_SIZE);
	3945	+ isp3_param_write(params_vdev, v, ISP32_VSM_V_SIZE, id);
3854	3946
3855	3947	val = arg->h_segments;
3856	3948	if (val > (h - 48) / 16)
3857	3949	val = (h - 48) / 16;
3858		- isp3_param_write(params_vdev, val, ISP32_VSM_H_SEGMENTS);
	3950	+ isp3_param_write(params_vdev, val, ISP32_VSM_H_SEGMENTS, id);
3859	3951
3860	3952	val = arg->v_segments;
3861	3953	if (val > (v - 48) / 16)
3862	3954	val = (v - 48) / 16;
3863		- isp3_param_write(params_vdev, val, ISP32_VSM_V_SEGMENTS);
	3955	+ isp3_param_write(params_vdev, val, ISP32_VSM_V_SEGMENTS, id);
3864	3956	}
3865	3957
3866	3958	static void
3867	3959	isp_vsm_enable(struct rkisp_isp_params_vdev *params_vdev,
3868		- bool en)
	3960	+ bool en, u32 id)
3869	3961	{
3870		- isp3_param_write(params_vdev, en, ISP32_VSM_MODE);
	3962	+ isp3_param_write(params_vdev, en, ISP32_VSM_MODE, id);
3871	3963	}
3872	3964
3873	3965	struct rkisp_isp_params_ops_v32 isp_params_ops_v32 = {
..	..	@@ -3946,7 +4038,7 @@
3946	4038	static __maybe_unused
3947	4039	void __isp_isr_other_config(struct rkisp_isp_params_vdev *params_vdev,
3948	4040	const struct isp32_isp_params_cfg *new_params,
3949		- enum rkisp_params_type type)
	4041	+ enum rkisp_params_type type, u32 id)
3950	4042	{
3951	4043	struct rkisp_isp_params_ops_v32 *ops =
3952	4044	(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
..	..	@@ -3958,101 +4050,101 @@
3958	4050
3959	4051	if (type == RKISP_PARAMS_SHD) {
3960	4052	if ((module_cfg_update & ISP32_MODULE_HDRMGE))
3961		- ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type);
	4053	+ ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type, id);
3962	4054
3963	4055	if ((module_cfg_update & ISP32_MODULE_DRC))
3964		- ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type);
	4056	+ ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type, id);
3965	4057	return;
3966	4058	}
3967	4059
3968	4060	v4l2_dbg(4, rkisp_debug, &params_vdev->dev->v4l2_dev,
3969		- "%s seq:%d module_cfg_update:0x%llx\n",
3970		- __func__, new_params->frame_id, module_cfg_update);
	4061	+ "%s id:%d seq:%d module_cfg_update:0x%llx\n",
	4062	+ __func__, id, new_params->frame_id, module_cfg_update);
3971	4063
3972	4064	if (module_cfg_update & ISP32_MODULE_LSC)
3973		- ops->lsc_config(params_vdev, &new_params->others.lsc_cfg);
	4065	+ ops->lsc_config(params_vdev, &new_params->others.lsc_cfg, id);
3974	4066
3975	4067	if (module_cfg_update & ISP32_MODULE_DPCC)
3976		- ops->dpcc_config(params_vdev, &new_params->others.dpcc_cfg);
	4068	+ ops->dpcc_config(params_vdev, &new_params->others.dpcc_cfg, id);
3977	4069
3978	4070	if (module_cfg_update & ISP32_MODULE_BLS)
3979		- ops->bls_config(params_vdev, &new_params->others.bls_cfg);
	4071	+ ops->bls_config(params_vdev, &new_params->others.bls_cfg, id);
3980	4072
3981	4073	if (module_cfg_update & ISP32_MODULE_SDG)
3982		- ops->sdg_config(params_vdev, &new_params->others.sdg_cfg);
	4074	+ ops->sdg_config(params_vdev, &new_params->others.sdg_cfg, id);
3983	4075
3984	4076	if (module_cfg_update & ISP32_MODULE_AWB_GAIN)
3985		- ops->awbgain_config(params_vdev, &new_params->others.awb_gain_cfg);
	4077	+ ops->awbgain_config(params_vdev, &new_params->others.awb_gain_cfg, id);
3986	4078
3987	4079	if (module_cfg_update & ISP32_MODULE_DEBAYER)
3988		- ops->debayer_config(params_vdev, &new_params->others.debayer_cfg);
	4080	+ ops->debayer_config(params_vdev, &new_params->others.debayer_cfg, id);
3989	4081
3990	4082	if (module_cfg_update & ISP32_MODULE_CCM)
3991		- ops->ccm_config(params_vdev, &new_params->others.ccm_cfg);
	4083	+ ops->ccm_config(params_vdev, &new_params->others.ccm_cfg, id);
3992	4084
3993	4085	if (module_cfg_update & ISP32_MODULE_GOC)
3994		- ops->goc_config(params_vdev, &new_params->others.gammaout_cfg);
	4086	+ ops->goc_config(params_vdev, &new_params->others.gammaout_cfg, id);
3995	4087
3996	4088	/* range csm->cgc->cproc->ie */
3997	4089	if (module_cfg_update & ISP3X_MODULE_CSM)
3998		- ops->csm_config(params_vdev, &new_params->others.csm_cfg);
	4090	+ ops->csm_config(params_vdev, &new_params->others.csm_cfg, id);
3999	4091
4000	4092	if (module_cfg_update & ISP3X_MODULE_CGC)
4001		- ops->cgc_config(params_vdev, &new_params->others.cgc_cfg);
	4093	+ ops->cgc_config(params_vdev, &new_params->others.cgc_cfg, id);
4002	4094
4003	4095	if (module_cfg_update & ISP32_MODULE_CPROC)
4004		- ops->cproc_config(params_vdev, &new_params->others.cproc_cfg);
	4096	+ ops->cproc_config(params_vdev, &new_params->others.cproc_cfg, id);
4005	4097
4006	4098	if (module_cfg_update & ISP32_MODULE_IE)
4007		- ops->ie_config(params_vdev, &new_params->others.ie_cfg);
	4099	+ ops->ie_config(params_vdev, &new_params->others.ie_cfg, id);
4008	4100
4009	4101	if (module_cfg_update & ISP32_MODULE_HDRMGE)
4010		- ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type);
	4102	+ ops->hdrmge_config(params_vdev, &new_params->others.hdrmge_cfg, type, id);
4011	4103
4012	4104	if (module_cfg_update & ISP32_MODULE_DRC)
4013		- ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type);
	4105	+ ops->hdrdrc_config(params_vdev, &new_params->others.drc_cfg, type, id);
4014	4106
4015	4107	if (module_cfg_update & ISP32_MODULE_GIC)
4016		- ops->gic_config(params_vdev, &new_params->others.gic_cfg);
	4108	+ ops->gic_config(params_vdev, &new_params->others.gic_cfg, id);
4017	4109
4018	4110	if (module_cfg_update & ISP32_MODULE_DHAZ)
4019		- ops->dhaz_config(params_vdev, &new_params->others.dhaz_cfg);
	4111	+ ops->dhaz_config(params_vdev, &new_params->others.dhaz_cfg, id);
4020	4112
4021	4113	if (module_cfg_update & ISP32_MODULE_3DLUT)
4022		- ops->isp3dlut_config(params_vdev, &new_params->others.isp3dlut_cfg);
	4114	+ ops->isp3dlut_config(params_vdev, &new_params->others.isp3dlut_cfg, id);
4023	4115
4024	4116	if (module_cfg_update & ISP32_MODULE_LDCH)
4025		- ops->ldch_config(params_vdev, &new_params->others.ldch_cfg);
	4117	+ ops->ldch_config(params_vdev, &new_params->others.ldch_cfg, id);
4026	4118
4027	4119	if (module_cfg_update & ISP32_MODULE_YNR)
4028		- ops->ynr_config(params_vdev, &new_params->others.ynr_cfg);
	4120	+ ops->ynr_config(params_vdev, &new_params->others.ynr_cfg, id);
4029	4121
4030	4122	if (module_cfg_update & ISP32_MODULE_CNR)
4031		- ops->cnr_config(params_vdev, &new_params->others.cnr_cfg);
	4123	+ ops->cnr_config(params_vdev, &new_params->others.cnr_cfg, id);
4032	4124
4033	4125	if (module_cfg_update & ISP32_MODULE_SHARP)
4034		- ops->sharp_config(params_vdev, &new_params->others.sharp_cfg);
	4126	+ ops->sharp_config(params_vdev, &new_params->others.sharp_cfg, id);
4035	4127
4036	4128	if (module_cfg_update & ISP32_MODULE_BAYNR)
4037		- ops->baynr_config(params_vdev, &new_params->others.baynr_cfg);
	4129	+ ops->baynr_config(params_vdev, &new_params->others.baynr_cfg, id);
4038	4130
4039	4131	if (module_cfg_update & ISP32_MODULE_BAY3D)
4040		- ops->bay3d_config(params_vdev, &new_params->others.bay3d_cfg);
	4132	+ ops->bay3d_config(params_vdev, &new_params->others.bay3d_cfg, id);
4041	4133
4042	4134	if (module_cfg_update & ISP32_MODULE_CAC)
4043		- ops->cac_config(params_vdev, &new_params->others.cac_cfg);
	4135	+ ops->cac_config(params_vdev, &new_params->others.cac_cfg, id);
4044	4136
4045	4137	if (module_cfg_update & ISP32_MODULE_GAIN)
4046		- ops->gain_config(params_vdev, &new_params->others.gain_cfg);
	4138	+ ops->gain_config(params_vdev, &new_params->others.gain_cfg, id);
4047	4139
4048	4140	if (module_cfg_update & ISP32_MODULE_VSM)
4049		- ops->vsm_config(params_vdev, &new_params->others.vsm_cfg);
	4141	+ ops->vsm_config(params_vdev, &new_params->others.vsm_cfg, id);
4050	4142	}
4051	4143
4052	4144	static __maybe_unused
4053	4145	void __isp_isr_other_en(struct rkisp_isp_params_vdev *params_vdev,
4054	4146	const struct isp32_isp_params_cfg *new_params,
4055		- enum rkisp_params_type type)
	4147	+ enum rkisp_params_type type, u32 id)
4056	4148	{
4057	4149	struct rkisp_isp_params_ops_v32 *ops =
4058	4150	(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
..	..	@@ -4070,110 +4162,110 @@
4070	4162	return;
4071	4163
4072	4164	v4l2_dbg(4, rkisp_debug, &params_vdev->dev->v4l2_dev,
4073		- "%s seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
4074		- __func__, new_params->frame_id, module_en_update, module_ens);
	4165	+ "%s id:%d seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
	4166	+ __func__, id, new_params->frame_id, module_en_update, module_ens);
4075	4167
4076	4168	if (module_en_update & ISP32_MODULE_DPCC)
4077		- ops->dpcc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DPCC));
	4169	+ ops->dpcc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DPCC), id);
4078	4170
4079	4171	if (module_en_update & ISP32_MODULE_BLS)
4080		- ops->bls_enable(params_vdev, !!(module_ens & ISP32_MODULE_BLS));
	4172	+ ops->bls_enable(params_vdev, !!(module_ens & ISP32_MODULE_BLS), id);
4081	4173
4082	4174	if (module_en_update & ISP32_MODULE_SDG)
4083		- ops->sdg_enable(params_vdev, !!(module_ens & ISP32_MODULE_SDG));
	4175	+ ops->sdg_enable(params_vdev, !!(module_ens & ISP32_MODULE_SDG), id);
4084	4176
4085	4177	if (module_en_update & ISP32_MODULE_LSC) {
4086		- ops->lsc_enable(params_vdev, !!(module_ens & ISP32_MODULE_LSC));
	4178	+ ops->lsc_enable(params_vdev, !!(module_ens & ISP32_MODULE_LSC), id);
4087	4179	priv_val->lsc_en = !!(module_ens & ISP32_MODULE_LSC);
4088	4180	}
4089	4181
4090	4182	if (module_en_update & ISP32_MODULE_AWB_GAIN)
4091		- ops->awbgain_enable(params_vdev, !!(module_ens & ISP32_MODULE_AWB_GAIN));
	4183	+ ops->awbgain_enable(params_vdev, !!(module_ens & ISP32_MODULE_AWB_GAIN), id);
4092	4184
4093	4185	if (module_en_update & ISP32_MODULE_DEBAYER)
4094		- ops->debayer_enable(params_vdev, !!(module_ens & ISP32_MODULE_DEBAYER));
	4186	+ ops->debayer_enable(params_vdev, !!(module_ens & ISP32_MODULE_DEBAYER), id);
4095	4187
4096	4188	if (module_en_update & ISP32_MODULE_CCM)
4097		- ops->ccm_enable(params_vdev, !!(module_ens & ISP32_MODULE_CCM));
	4189	+ ops->ccm_enable(params_vdev, !!(module_ens & ISP32_MODULE_CCM), id);
4098	4190
4099	4191	if (module_en_update & ISP32_MODULE_GOC)
4100		- ops->goc_enable(params_vdev, !!(module_ens & ISP32_MODULE_GOC));
	4192	+ ops->goc_enable(params_vdev, !!(module_ens & ISP32_MODULE_GOC), id);
4101	4193
4102	4194	if (module_en_update & ISP32_MODULE_CPROC)
4103		- ops->cproc_enable(params_vdev, !!(module_ens & ISP32_MODULE_CPROC));
	4195	+ ops->cproc_enable(params_vdev, !!(module_ens & ISP32_MODULE_CPROC), id);
4104	4196
4105	4197	if (module_en_update & ISP32_MODULE_IE)
4106		- ops->ie_enable(params_vdev, !!(module_ens & ISP32_MODULE_IE));
	4198	+ ops->ie_enable(params_vdev, !!(module_ens & ISP32_MODULE_IE), id);
4107	4199
4108	4200	if (module_en_update & ISP32_MODULE_HDRMGE) {
4109		- ops->hdrmge_enable(params_vdev, !!(module_ens & ISP32_MODULE_HDRMGE));
	4201	+ ops->hdrmge_enable(params_vdev, !!(module_ens & ISP32_MODULE_HDRMGE), id);
4110	4202	priv_val->mge_en = !!(module_ens & ISP32_MODULE_HDRMGE);
4111	4203	}
4112	4204
4113	4205	if (module_en_update & ISP32_MODULE_DRC) {
4114		- ops->hdrdrc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DRC));
	4206	+ ops->hdrdrc_enable(params_vdev, !!(module_ens & ISP32_MODULE_DRC), id);
4115	4207	priv_val->drc_en = !!(module_ens & ISP32_MODULE_DRC);
4116	4208	}
4117	4209
4118	4210	if (module_en_update & ISP32_MODULE_GIC)
4119		- ops->gic_enable(params_vdev, !!(module_ens & ISP32_MODULE_GIC));
	4211	+ ops->gic_enable(params_vdev, !!(module_ens & ISP32_MODULE_GIC), id);
4120	4212
4121	4213	if (module_en_update & ISP32_MODULE_DHAZ) {
4122		- ops->dhaz_enable(params_vdev, !!(module_ens & ISP32_MODULE_DHAZ));
	4214	+ ops->dhaz_enable(params_vdev, !!(module_ens & ISP32_MODULE_DHAZ), id);
4123	4215	priv_val->dhaz_en = !!(module_ens & ISP32_MODULE_DHAZ);
4124	4216	}
4125	4217
4126	4218	if (module_en_update & ISP32_MODULE_3DLUT) {
4127		- ops->isp3dlut_enable(params_vdev, !!(module_ens & ISP32_MODULE_3DLUT));
	4219	+ ops->isp3dlut_enable(params_vdev, !!(module_ens & ISP32_MODULE_3DLUT), id);
4128	4220	priv_val->lut3d_en = !!(module_ens & ISP32_MODULE_3DLUT);
4129	4221	}
4130	4222
4131	4223	if (module_en_update & ISP32_MODULE_LDCH)
4132		- ops->ldch_enable(params_vdev, !!(module_ens & ISP32_MODULE_LDCH));
	4224	+ ops->ldch_enable(params_vdev, !!(module_ens & ISP32_MODULE_LDCH), id);
4133	4225
4134	4226	if (module_en_update & ISP32_MODULE_YNR)
4135		- ops->ynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_YNR));
	4227	+ ops->ynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_YNR), id);
4136	4228
4137	4229	if (module_en_update & ISP32_MODULE_CNR)
4138		- ops->cnr_enable(params_vdev, !!(module_ens & ISP32_MODULE_CNR));
	4230	+ ops->cnr_enable(params_vdev, !!(module_ens & ISP32_MODULE_CNR), id);
4139	4231
4140	4232	if (module_en_update & ISP32_MODULE_SHARP)
4141		- ops->sharp_enable(params_vdev, !!(module_ens & ISP32_MODULE_SHARP));
	4233	+ ops->sharp_enable(params_vdev, !!(module_ens & ISP32_MODULE_SHARP), id);
4142	4234
4143	4235	if (module_en_update & ISP32_MODULE_BAYNR)
4144		- ops->baynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAYNR));
	4236	+ ops->baynr_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAYNR), id);
4145	4237
4146	4238	if (module_en_update & ISP32_MODULE_BAY3D) {
4147		- ops->bay3d_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAY3D));
	4239	+ ops->bay3d_enable(params_vdev, !!(module_ens & ISP32_MODULE_BAY3D), id);
4148	4240	priv_val->bay3d_en = !!(module_ens & ISP32_MODULE_BAY3D);
4149	4241	}
4150	4242
4151	4243	if (module_en_update & ISP32_MODULE_CAC)
4152		- ops->cac_enable(params_vdev, !!(module_ens & ISP32_MODULE_CAC));
	4244	+ ops->cac_enable(params_vdev, !!(module_ens & ISP32_MODULE_CAC), id);
4153	4245
4154	4246	if (module_en_update & ISP32_MODULE_GAIN \|\|
4155	4247	((priv_val->buf_info_owner == RKISP_INFO2DRR_OWNER_GAIN) &&
4156		- !(isp3_param_read(params_vdev, ISP3X_GAIN_CTRL) & ISP3X_GAIN_2DDR_EN)))
4157		- ops->gain_enable(params_vdev, !!(module_ens & ISP32_MODULE_GAIN));
	4248	+ !(isp3_param_read(params_vdev, ISP3X_GAIN_CTRL, id) & ISP3X_GAIN_2DDR_EN)))
	4249	+ ops->gain_enable(params_vdev, !!(module_ens & ISP32_MODULE_GAIN), id);
4158	4250
4159	4251	if (module_en_update & ISP32_MODULE_VSM)
4160		- ops->vsm_enable(params_vdev, !!(module_ens & ISP32_MODULE_VSM));
	4252	+ ops->vsm_enable(params_vdev, !!(module_ens & ISP32_MODULE_VSM), id);
4161	4253
4162	4254	/* gain disable, using global gain for cnr */
4163		- gain_ctrl = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL);
4164		- cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL);
	4255	+ gain_ctrl = isp3_param_read_cache(params_vdev, ISP3X_GAIN_CTRL, id);
	4256	+ cnr_ctrl = isp3_param_read_cache(params_vdev, ISP3X_CNR_CTRL, id);
4165	4257	if (!(gain_ctrl & ISP32_MODULE_EN) && cnr_ctrl & ISP32_MODULE_EN) {
4166	4258	cnr_ctrl \|= BIT(1);
4167		- isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL);
4168		- val = isp3_param_read(params_vdev, ISP3X_CNR_EXGAIN) & 0x3ff;
4169		- isp3_param_write(params_vdev, val \| 0x8000, ISP3X_CNR_EXGAIN);
	4259	+ isp3_param_write(params_vdev, cnr_ctrl, ISP3X_CNR_CTRL, id);
	4260	+ val = isp3_param_read(params_vdev, ISP3X_CNR_EXGAIN, id) & 0x3ff;
	4261	+ isp3_param_write(params_vdev, val \| 0x8000, ISP3X_CNR_EXGAIN, id);
4170	4262	}
4171	4263	}
4172	4264
4173	4265	static __maybe_unused
4174	4266	void __isp_isr_meas_config(struct rkisp_isp_params_vdev *params_vdev,
4175	4267	struct isp32_isp_params_cfg *new_params,
4176		- enum rkisp_params_type type)
	4268	+ enum rkisp_params_type type, u32 id)
4177	4269	{
4178	4270	struct rkisp_isp_params_ops_v32 *ops =
4179	4271	(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
..	..	@@ -4190,48 +4282,48 @@
4190	4282	return;
4191	4283
4192	4284	v4l2_dbg(4, rkisp_debug, &params_vdev->dev->v4l2_dev,
4193		- "%s seq:%d module_cfg_update:0x%llx\n",
4194		- __func__, new_params->frame_id, module_cfg_update);
	4285	+ "%s id:%d seq:%d module_cfg_update:0x%llx\n",
	4286	+ __func__, id, new_params->frame_id, module_cfg_update);
4195	4287
4196	4288	if ((module_cfg_update & ISP32_MODULE_RAWAF))
4197		- ops->rawaf_config(params_vdev, &new_params->meas.rawaf);
	4289	+ ops->rawaf_config(params_vdev, &new_params->meas.rawaf, id);
4198	4290
4199	4291	if ((module_cfg_update & ISP32_MODULE_RAWAE0) &&
4200	4292	!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32_L))
4201		- ops->rawae0_config(params_vdev, &new_params->meas.rawae0);
	4293	+ ops->rawae0_config(params_vdev, &new_params->meas.rawae0, id);
4202	4294
4203	4295	if ((module_cfg_update & ISP32_MODULE_RAWAE1))
4204		- ops->rawae1_config(params_vdev, &new_params->meas.rawae1);
	4296	+ ops->rawae1_config(params_vdev, &new_params->meas.rawae1, id);
4205	4297
4206	4298	if ((module_cfg_update & ISP32_MODULE_RAWAE2))
4207		- ops->rawae2_config(params_vdev, &new_params->meas.rawae2);
	4299	+ ops->rawae2_config(params_vdev, &new_params->meas.rawae2, id);
4208	4300
4209	4301	if ((module_cfg_update & ISP32_MODULE_RAWAE3) &&
4210	4302	!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32))
4211		- ops->rawae3_config(params_vdev, &new_params->meas.rawae3);
	4303	+ ops->rawae3_config(params_vdev, &new_params->meas.rawae3, id);
4212	4304
4213	4305	if ((module_cfg_update & ISP32_MODULE_RAWHIST0))
4214		- ops->rawhst0_config(params_vdev, &new_params->meas.rawhist0);
	4306	+ ops->rawhst0_config(params_vdev, &new_params->meas.rawhist0, id);
4215	4307
4216	4308	if ((module_cfg_update & ISP32_MODULE_RAWHIST1))
4217		- ops->rawhst1_config(params_vdev, &new_params->meas.rawhist1);
	4309	+ ops->rawhst1_config(params_vdev, &new_params->meas.rawhist1, id);
4218	4310
4219	4311	if ((module_cfg_update & ISP32_MODULE_RAWHIST2))
4220		- ops->rawhst2_config(params_vdev, &new_params->meas.rawhist2);
	4312	+ ops->rawhst2_config(params_vdev, &new_params->meas.rawhist2, id);
4221	4313
4222	4314	if ((module_cfg_update & ISP32_MODULE_RAWHIST3))
4223		- ops->rawhst3_config(params_vdev, &new_params->meas.rawhist3);
	4315	+ ops->rawhst3_config(params_vdev, &new_params->meas.rawhist3, id);
4224	4316
4225	4317	if ((module_cfg_update & ISP32_MODULE_RAWAWB) \|\|
4226	4318	((priv_val->buf_info_owner == RKISP_INFO2DRR_OWNER_AWB) &&
4227		- !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL) & ISP32_RAWAWB_2DDR_PATH_EN)))
4228		- ops->rawawb_config(params_vdev, &new_params->meas.rawawb);
	4319	+ !(isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL, id) & ISP32_RAWAWB_2DDR_PATH_EN)))
	4320	+ ops->rawawb_config(params_vdev, &new_params->meas.rawawb, id);
4229	4321	}
4230	4322
4231	4323	static __maybe_unused
4232	4324	void __isp_isr_meas_en(struct rkisp_isp_params_vdev *params_vdev,
4233	4325	struct isp32_isp_params_cfg *new_params,
4234		- enum rkisp_params_type type)
	4326	+ enum rkisp_params_type type, u32 id)
4235	4327	{
4236	4328	struct rkisp_isp_params_ops_v32 *ops =
4237	4329	(struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
..	..	@@ -4245,64 +4337,53 @@
4245	4337	return;
4246	4338
4247	4339	v4l2_dbg(4, rkisp_debug, &params_vdev->dev->v4l2_dev,
4248		- "%s seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
4249		- __func__, new_params->frame_id, module_en_update, module_ens);
	4340	+ "%s id:%d seq:%d module_en_update:0x%llx module_ens:0x%llx\n",
	4341	+ __func__, id, new_params->frame_id, module_en_update, module_ens);
4250	4342
4251	4343	if (module_en_update & ISP32_MODULE_RAWAF)
4252		- ops->rawaf_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAF));
	4344	+ ops->rawaf_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAF), id);
4253	4345
4254	4346	if ((module_en_update & ISP32_MODULE_RAWAE0) &&
4255	4347	!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32_L))
4256		- ops->rawae0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE0));
	4348	+ ops->rawae0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE0), id);
4257	4349
4258	4350	if (module_en_update & ISP32_MODULE_RAWAE1)
4259		- ops->rawae1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE1));
	4351	+ ops->rawae1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE1), id);
4260	4352
4261	4353	if (module_en_update & ISP32_MODULE_RAWAE2)
4262		- ops->rawae2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE2));
	4354	+ ops->rawae2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE2), id);
4263	4355
4264	4356	if ((module_en_update & ISP32_MODULE_RAWAE3) &&
4265	4357	!(params_vdev->afaemode_en && params_vdev->dev->isp_ver == ISP_V32))
4266		- ops->rawae3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE3));
	4358	+ ops->rawae3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAE3), id);
4267	4359
4268	4360	if (module_en_update & ISP32_MODULE_RAWHIST0)
4269		- ops->rawhst0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST0));
	4361	+ ops->rawhst0_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST0), id);
4270	4362
4271	4363	if (module_en_update & ISP32_MODULE_RAWHIST1)
4272		- ops->rawhst1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST1));
	4364	+ ops->rawhst1_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST1), id);
4273	4365
4274	4366	if (module_en_update & ISP32_MODULE_RAWHIST2)
4275		- ops->rawhst2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST2));
	4367	+ ops->rawhst2_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST2), id);
4276	4368
4277	4369	if (module_en_update & ISP32_MODULE_RAWHIST3)
4278		- ops->rawhst3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST3));
	4370	+ ops->rawhst3_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWHIST3), id);
4279	4371
4280	4372	if (module_en_update & ISP32_MODULE_RAWAWB)
4281		- ops->rawawb_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAWB));
4282		-}
4283		-
4284		-static __maybe_unused
4285		-void __isp_config_hdrshd(struct rkisp_isp_params_vdev *params_vdev)
4286		-{
4287		- struct rkisp_isp_params_ops_v32 *ops =
4288		- (struct rkisp_isp_params_ops_v32 *)params_vdev->priv_ops;
4289		- struct rkisp_isp_params_val_v32 *priv_val =
4290		- (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
4291		-
4292		- ops->hdrmge_config(params_vdev, &priv_val->last_hdrmge, RKISP_PARAMS_SHD);
4293		- ops->hdrdrc_config(params_vdev, &priv_val->last_hdrdrc, RKISP_PARAMS_SHD);
	4373	+ ops->rawawb_enable(params_vdev, !!(module_ens & ISP32_MODULE_RAWAWB), id);
4294	4374	}
4295	4375
4296	4376	static
4297	4377	void rkisp_params_cfgsram_v32(struct rkisp_isp_params_vdev *params_vdev)
4298	4378	{
4299		- struct isp32_isp_params_cfg *params = params_vdev->isp32_params;
	4379	+ u32 id = params_vdev->dev->unite_index;
	4380	+ struct isp32_isp_params_cfg *params = params_vdev->isp32_params + id;
4300	4381
4301		- isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true);
4302		- isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist1, 1, true);
4303		- isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist2, 2, true);
4304		- isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist3, 0, true);
4305		- isp_rawawb_cfg_sram(params_vdev, &params->meas.rawawb, true);
	4382	+ isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true, id);
	4383	+ isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist1, 1, true, id);
	4384	+ isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist2, 2, true, id);
	4385	+ isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist3, 0, true, id);
	4386	+ isp_rawawb_cfg_sram(params_vdev, &params->meas.rawawb, true, id);
4306	4387	}
4307	4388
4308	4389	static int
..	..	@@ -4313,22 +4394,24 @@
4313	4394	struct rkisp_isp_subdev *isp_sdev = &dev->isp_sdev;
4314	4395	struct rkisp_isp_params_val_v32 *priv_val;
4315	4396	u64 module_en_update, module_ens;
4316		- int ret, i;
	4397	+ int ret, i, id;
4317	4398
4318	4399	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
4319	4400	module_en_update = new_params->module_en_update;
4320	4401	module_ens = new_params->module_ens;
4321	4402
4322		- priv_val->buf_3dlut_idx = 0;
4323		- for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++) {
4324		- if (priv_val->buf_3dlut[i].mem_priv)
4325		- continue;
4326		- priv_val->buf_3dlut[i].is_need_vaddr = true;
4327		- priv_val->buf_3dlut[i].size = ISP32_3DLUT_BUF_SIZE;
4328		- ret = rkisp_alloc_buffer(dev, &priv_val->buf_3dlut[i]);
4329		- if (ret) {
4330		- dev_err(dev->dev, "alloc 3dlut buf fail:%d\n", ret);
4331		- goto err_3dlut;
	4403	+ for (id = 0; id <= !!dev->hw_dev->unite; id++) {
	4404	+ priv_val->buf_3dlut_idx[id] = 0;
	4405	+ for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++) {
	4406	+ if (priv_val->buf_3dlut[id][i].mem_priv)
	4407	+ continue;
	4408	+ priv_val->buf_3dlut[id][i].is_need_vaddr = true;
	4409	+ priv_val->buf_3dlut[id][i].size = ISP32_3DLUT_BUF_SIZE;
	4410	+ ret = rkisp_alloc_buffer(dev, &priv_val->buf_3dlut[id][i]);
	4411	+ if (ret) {
	4412	+ dev_err(dev->dev, "alloc 3dlut buf fail:%d\n", ret);
	4413	+ goto err_3dlut;
	4414	+ }
4332	4415	}
4333	4416	}
4334	4417
..	..	@@ -4343,6 +4426,9 @@
4343	4426	u32 h = ALIGN(isp_sdev->in_crop.height, 16);
4344	4427	u32 val, wrap_line, wsize, div;
4345	4428	bool is_alloc;
	4429	+
	4430	+ if (dev->hw_dev->unite)
	4431	+ w = ALIGN(isp_sdev->in_crop.width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL, 16);
4346	4432
4347	4433	priv_val->is_lo8x8 = (!new_params->others.bay3d_cfg.lo4x8_en &&
4348	4434	!new_params->others.bay3d_cfg.lo4x4_en);
..	..	@@ -4361,6 +4447,9 @@
4361	4447	wsize *= 2;
4362	4448	div = is_bwopt_dis ? 1 : 2;
4363	4449	val = ALIGN(wsize * h / div, 16);
	4450	+ priv_val->bay3d_iir_size = val;
	4451	+ if (dev->hw_dev->unite)
	4452	+ val *= 2;
4364	4453	is_alloc = true;
4365	4454	if (priv_val->buf_3dnr_iir.mem_priv) {
4366	4455	if (val > priv_val->buf_3dnr_iir.size)
..	..	@@ -4381,6 +4470,9 @@
4381	4470	val = w * h / div;
4382	4471	/* pixel to Byte and align */
4383	4472	val = ALIGN(val * 2, 16);
	4473	+ priv_val->bay3d_ds_size = val;
	4474	+ if (dev->hw_dev->unite)
	4475	+ val *= 2;
4384	4476	is_alloc = true;
4385	4477	if (priv_val->buf_3dnr_ds.mem_priv) {
4386	4478	if (val > priv_val->buf_3dnr_ds.size)
..	..	@@ -4413,8 +4505,7 @@
4413	4505	val = ALIGN(wsize * wrap_line / div, 16);
4414	4506	is_alloc = true;
4415	4507	if (priv_val->buf_3dnr_cur.mem_priv) {
4416		- if (val > priv_val->buf_3dnr_cur.size \|\|
4417		- val < dev->hw_dev->sram.size)
	4508	+ if (val > priv_val->buf_3dnr_cur.size \|\| val < dev->hw_dev->sram.size)
4418	4509	rkisp_free_buffer(dev, &priv_val->buf_3dnr_cur);
4419	4510	else
4420	4511	is_alloc = false;
..	..	@@ -4440,6 +4531,8 @@
4440	4531	if (dev->isp_ver == ISP_V32_L) {
4441	4532	if (dev->hw_dev->is_frm_buf && !priv_val->buf_frm.mem_priv) {
4442	4533	priv_val->buf_frm.size = ISP32_LITE_FRM_BUF_SIZE;
	4534	+ if (dev->hw_dev->unite)
	4535	+ priv_val->buf_frm.size *= 2;
4443	4536	ret = rkisp_alloc_buffer(dev, &priv_val->buf_frm);
4444	4537	if (ret) {
4445	4538	dev_err(dev->dev, "alloc frm buf fail:%d\n", ret);
..	..	@@ -4469,10 +4562,14 @@
4469	4562	rkisp_free_buffer(dev, &priv_val->buf_3dnr_iir);
4470	4563	rkisp_free_buffer(dev, &priv_val->buf_3dnr_ds);
4471	4564	err_3dnr:
	4565	+ id = dev->hw_dev->unite ? 1 : 0;
4472	4566	i = ISP32_3DLUT_BUF_NUM;
4473	4567	err_3dlut:
4474		- for (i -= 1; i >= 0; i--)
4475		- rkisp_free_buffer(dev, &priv_val->buf_3dlut[i]);
	4568	+ for (; id >= 0; id--) {
	4569	+ for (i -= 1; i >= 0; i--)
	4570	+ rkisp_free_buffer(dev, &priv_val->buf_3dlut[id][i]);
	4571	+ i = ISP32_3DLUT_BUF_NUM;
	4572	+ }
4476	4573	return ret;
4477	4574	}
4478	4575
..	..	@@ -4664,6 +4761,8 @@
4664	4761	if (ispdev->isp_ver == ISP_V32_L)
4665	4762	return rkisp_params_check_bigmode_v32_lite(params_vdev);
4666	4763
	4764	+ if (hw->unite == ISP_UNITE_ONE)
	4765	+ hw->is_multi_overflow = true;
4667	4766	multi_overflow:
4668	4767	if (hw->is_multi_overflow) {
4669	4768	ispdev->multi_index = 0;
..	..	@@ -4831,6 +4930,7 @@
4831	4930	rkisp_params_first_cfg_v32(struct rkisp_isp_params_vdev *params_vdev)
4832	4931	{
4833	4932	struct rkisp_device *dev = params_vdev->dev;
	4933	+ struct rkisp_hw_dev *hw = dev->hw_dev;
4834	4934	struct rkisp_isp_params_val_v32 *priv_val =
4835	4935	(struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
4836	4936
..	..	@@ -4847,25 +4947,39 @@
4847	4947	priv_val->lsc_en = 0;
4848	4948	priv_val->mge_en = 0;
4849	4949	priv_val->lut3d_en = 0;
	4950	+ if (hw->unite) {
	4951	+ if (dev->is_bigmode)
	4952	+ rkisp_next_set_bits(dev, ISP3X_ISP_CTRL1, 0,
	4953	+ ISP3X_BIGMODE_MANUAL \| ISP3X_BIGMODE_FORCE_EN, false);
	4954	+ __isp_isr_meas_config(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
	4955	+ __isp_isr_other_config(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
	4956	+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
	4957	+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params + 1, RKISP_PARAMS_ALL, 1);
	4958	+ }
4850	4959	if (dev->is_bigmode)
4851		- rkisp_set_bits(params_vdev->dev, ISP3X_ISP_CTRL1, 0,
	4960	+ rkisp_set_bits(dev, ISP3X_ISP_CTRL1, 0,
4852	4961	ISP3X_BIGMODE_MANUAL \| ISP3X_BIGMODE_FORCE_EN, false);
4853	4962
4854		- __isp_isr_meas_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
4855		- __isp_isr_other_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
4856		- __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
4857		- __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
	4963	+ __isp_isr_meas_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
	4964	+ __isp_isr_other_config(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
	4965	+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
	4966	+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
4858	4967
4859		- priv_val->cur_hdrmge = params_vdev->isp32_params->others.hdrmge_cfg;
4860		- priv_val->cur_hdrdrc = params_vdev->isp32_params->others.drc_cfg;
4861		- priv_val->last_hdrmge = priv_val->cur_hdrmge;
4862		- priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
4863	4968	spin_unlock(&params_vdev->config_lock);
4864	4969
4865	4970	if (dev->hw_dev->is_frm_buf && priv_val->buf_frm.mem_priv) {
4866		- isp3_param_write(params_vdev, priv_val->buf_frm.size, ISP32L_FRM_BUF_WR_SIZE);
4867		- isp3_param_write(params_vdev, priv_val->buf_frm.dma_addr, ISP32L_FRM_BUF_WR_BASE);
4868		- isp3_param_write(params_vdev, priv_val->buf_frm.dma_addr, ISP32L_FRM_BUF_RD_BASE);
	4971	+ u32 size = priv_val->buf_frm.size;
	4972	+ u32 addr = priv_val->buf_frm.dma_addr;
	4973	+
	4974	+ if (hw->unite) {
	4975	+ size /= 2;
	4976	+ isp3_param_write(params_vdev, size, ISP32L_FRM_BUF_WR_SIZE, 1);
	4977	+ isp3_param_write(params_vdev, addr + size, ISP32L_FRM_BUF_WR_BASE, 1);
	4978	+ isp3_param_write(params_vdev, addr + size, ISP32L_FRM_BUF_RD_BASE, 1);
	4979	+ }
	4980	+ isp3_param_write(params_vdev, size, ISP32L_FRM_BUF_WR_SIZE, 0);
	4981	+ isp3_param_write(params_vdev, addr, ISP32L_FRM_BUF_WR_BASE, 0);
	4982	+ isp3_param_write(params_vdev, addr, ISP32L_FRM_BUF_RD_BASE, 0);
4869	4983	}
4870	4984	if (dev->hw_dev->is_single && (dev->isp_state & ISP_START))
4871	4985	rkisp_set_bits(dev, ISP3X_ISP_CTRL0, 0, CIF_ISP_CTRL_ISP_CFG_UPD, true);
..	..	@@ -4879,11 +4993,15 @@
4879	4993
4880	4994	static void rkisp_clear_first_param_v32(struct rkisp_isp_params_vdev *params_vdev)
4881	4995	{
4882		- memset(params_vdev->isp32_params, 0, sizeof(struct isp32_isp_params_cfg));
	4996	+ u32 size = sizeof(struct isp32_isp_params_cfg);
	4997	+
	4998	+ if (params_vdev->dev->hw_dev->unite)
	4999	+ size *= 2;
	5000	+ memset(params_vdev->isp32_params, 0, size);
4883	5001	}
4884	5002
4885	5003	static void rkisp_deinit_mesh_buf(struct rkisp_isp_params_vdev *params_vdev,
4886		- u64 module_id)
	5004	+ u64 module_id, u32 id)
4887	5005	{
4888	5006	struct rkisp_isp_params_val_v32 *priv_val;
4889	5007	struct rkisp_dummy_buffer *buf;
..	..	@@ -4895,11 +5013,11 @@
4895	5013
4896	5014	switch (module_id) {
4897	5015	case ISP32_MODULE_CAC:
4898		- buf = priv_val->buf_cac;
	5016	+ buf = priv_val->buf_cac[id];
4899	5017	break;
4900	5018	case ISP32_MODULE_LDCH:
4901	5019	default:
4902		- buf = priv_val->buf_ldch;
	5020	+ buf = priv_val->buf_ldch[id];
4903	5021	break;
4904	5022	}
4905	5023
..	..	@@ -4919,6 +5037,7 @@
4919	5037	u32 mesh_h = meshsize->meas_height;
4920	5038	u32 mesh_size, buf_size;
4921	5039	int i, ret, buf_cnt = meshsize->buf_cnt;
	5040	+ int id = meshsize->unite_isp_id;
4922	5041	bool is_alloc;
4923	5042
4924	5043	priv_val = params_vdev->priv_val;
..	..	@@ -4929,16 +5048,16 @@
4929	5048
4930	5049	switch (meshsize->module_id) {
4931	5050	case ISP32_MODULE_CAC:
4932		- priv_val->buf_cac_idx = 0;
4933		- buf = priv_val->buf_cac;
	5051	+ priv_val->buf_cac_idx[id] = 0;
	5052	+ buf = priv_val->buf_cac[id];
4934	5053	mesh_w = (mesh_w + 62) / 64 * 9;
4935	5054	mesh_h = (mesh_h + 62) / 64 * 2;
4936	5055	mesh_size = mesh_w * 4 * mesh_h;
4937	5056	break;
4938	5057	case ISP32_MODULE_LDCH:
4939	5058	default:
4940		- priv_val->buf_ldch_idx = 0;
4941		- buf = priv_val->buf_ldch;
	5059	+ priv_val->buf_ldch_idx[id] = 0;
	5060	+ buf = priv_val->buf_ldch[id];
4942	5061	mesh_w = ((mesh_w + 15) / 16 + 2) / 2;
4943	5062	mesh_h = (mesh_h + 7) / 8 + 1;
4944	5063	mesh_size = mesh_w * 4 * mesh_h;
..	..	@@ -4979,7 +5098,7 @@
4979	5098
4980	5099	return 0;
4981	5100	err:
4982		- rkisp_deinit_mesh_buf(params_vdev, meshsize->module_id);
	5101	+ rkisp_deinit_mesh_buf(params_vdev, meshsize->module_id, id);
4983	5102	return -ENOMEM;
4984	5103	}
4985	5104
..	..	@@ -4987,7 +5106,9 @@
4987	5106	rkisp_get_param_size_v32(struct rkisp_isp_params_vdev *params_vdev,
4988	5107	unsigned int sizes[])
4989	5108	{
4990		- sizes[0] = sizeof(struct isp32_isp_params_cfg);
	5109	+ u32 mult = params_vdev->dev->hw_dev->unite ? 2 : 1;
	5110	+
	5111	+ sizes[0] = sizeof(struct isp32_isp_params_cfg) * mult;
4991	5112	}
4992	5113
4993	5114	static void
..	..	@@ -4997,18 +5118,18 @@
4997	5118	struct rkisp_isp_params_val_v32 *priv_val;
4998	5119	struct rkisp_meshbuf_info *meshbuf = meshbuf_inf;
4999	5120	struct rkisp_dummy_buffer *buf;
5000		- int i;
	5121	+ int i, id = meshbuf->unite_isp_id;
5001	5122
5002	5123	priv_val = params_vdev->priv_val;
5003	5124	switch (meshbuf->module_id) {
5004	5125	case ISP32_MODULE_CAC:
5005		- priv_val->buf_cac_idx = 0;
5006		- buf = priv_val->buf_cac;
	5126	+ priv_val->buf_cac_idx[id] = 0;
	5127	+ buf = priv_val->buf_cac[id];
5007	5128	break;
5008	5129	case ISP32_MODULE_LDCH:
5009	5130	default:
5010		- priv_val->buf_ldch_idx = 0;
5011		- buf = priv_val->buf_ldch;
	5131	+ priv_val->buf_ldch_idx[id] = 0;
	5132	+ buf = priv_val->buf_ldch[id];
5012	5133	break;
5013	5134	}
5014	5135
..	..	@@ -5030,6 +5151,8 @@
5030	5151	{
5031	5152	struct rkisp_meshbuf_size *meshsize = size;
5032	5153
	5154	+ if (!params_vdev->dev->hw_dev->unite)
	5155	+ meshsize->unite_isp_id = 0;
5033	5156	return rkisp_init_mesh_buf(params_vdev, meshsize);
5034	5157	}
5035	5158
..	..	@@ -5037,7 +5160,10 @@
5037	5160	rkisp_params_free_meshbuf_v32(struct rkisp_isp_params_vdev *params_vdev,
5038	5161	u64 module_id)
5039	5162	{
5040		- rkisp_deinit_mesh_buf(params_vdev, module_id);
	5163	+ int id;
	5164	+
	5165	+ for (id = 0; id <= !!params_vdev->dev->hw_dev->unite; id++)
	5166	+ rkisp_deinit_mesh_buf(params_vdev, module_id, id);
5041	5167	}
5042	5168
5043	5169	static int
..	..	@@ -5134,9 +5260,9 @@
5134	5260	cfg->buf_fd[i] = buf->dma_fd;
5135	5261	}
5136	5262	buf = &priv_val->buf_info[0];
5137		- isp3_param_write(params_vdev, buf->dma_addr, ISP3X_MI_GAIN_WR_BASE);
5138		- isp3_param_write(params_vdev, buf->size, ISP3X_MI_GAIN_WR_SIZE);
5139		- isp3_param_write(params_vdev, wsize, ISP3X_MI_GAIN_WR_LENGTH);
	5263	+ isp3_param_write(params_vdev, buf->dma_addr, ISP3X_MI_GAIN_WR_BASE, 0);
	5264	+ isp3_param_write(params_vdev, buf->size, ISP3X_MI_GAIN_WR_SIZE, 0);
	5265	+ isp3_param_write(params_vdev, wsize, ISP3X_MI_GAIN_WR_LENGTH, 0);
5140	5266	if (dev->hw_dev->is_single)
5141	5267	rkisp_write(dev, ISP3X_MI_WR_CTRL2, ISP3X_GAINSELF_UPD, true);
5142	5268	rkisp_set_reg_cache_bits(dev, reg, mask, ctrl);
..	..	@@ -5164,7 +5290,7 @@
5164	5290	{
5165	5291	struct rkisp_device *ispdev = params_vdev->dev;
5166	5292	struct rkisp_isp_params_val_v32 *priv_val;
5167		- int i;
	5293	+ int i, id;
5168	5294
5169	5295	priv_val = (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
5170	5296	rkisp_free_buffer(ispdev, &priv_val->buf_frm);
..	..	@@ -5173,10 +5299,12 @@
5173	5299	rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_ds);
5174	5300	for (i = 0; i < ISP32_LSC_LUT_BUF_NUM; i++)
5175	5301	rkisp_free_buffer(ispdev, &priv_val->buf_lsclut[i]);
5176		- for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++)
5177		- rkisp_free_buffer(ispdev, &priv_val->buf_3dlut[i]);
5178	5302	for (i = 0; i < RKISP_STATS_DDR_BUF_NUM; i++)
5179	5303	rkisp_free_buffer(ispdev, &ispdev->stats_vdev.stats_buf[i]);
	5304	+ for (id = 0; id <= !!ispdev->hw_dev->unite; id++) {
	5305	+ for (i = 0; i < ISP32_3DLUT_BUF_NUM; i++)
	5306	+ rkisp_free_buffer(ispdev, &priv_val->buf_3dlut[id][i]);
	5307	+ }
5180	5308	priv_val->buf_info_owner = 0;
5181	5309	priv_val->buf_info_cnt = 0;
5182	5310	priv_val->buf_info_idx = -1;
..	..	@@ -5187,8 +5315,12 @@
5187	5315	static void
5188	5316	rkisp_params_fop_release_v32(struct rkisp_isp_params_vdev *params_vdev)
5189	5317	{
5190		- rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_LDCH);
5191		- rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_CAC);
	5318	+ int id;
	5319	+
	5320	+ for (id = 0; id <= !!params_vdev->dev->hw_dev->unite; id++) {
	5321	+ rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_LDCH, id);
	5322	+ rkisp_deinit_mesh_buf(params_vdev, ISP32_MODULE_CAC, id);
	5323	+ }
5192	5324	}
5193	5325
5194	5326	/* Not called when the camera active, thus not isr protection. */
..	..	@@ -5198,13 +5330,17 @@
5198	5330	params_vdev->isp32_params->module_ens = 0;
5199	5331	params_vdev->isp32_params->module_en_update = 0x7ffffffffff;
5200	5332
5201		- __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
5202		- __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL);
	5333	+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
	5334	+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 0);
	5335	+ if (params_vdev->dev->hw_dev->unite) {
	5336	+ __isp_isr_other_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 1);
	5337	+ __isp_isr_meas_en(params_vdev, params_vdev->isp32_params, RKISP_PARAMS_ALL, 1);
	5338	+ }
5203	5339	}
5204	5340
5205	5341	static void
5206	5342	module_data_abandon(struct rkisp_isp_params_vdev *params_vdev,
5207		- struct isp32_isp_params_cfg *params)
	5343	+ struct isp32_isp_params_cfg *params, u32 id)
5208	5344	{
5209	5345	struct rkisp_isp_params_val_v32 *priv_val;
5210	5346	struct isp2x_mesh_head *mesh_head;
..	..	@@ -5215,9 +5351,9 @@
5215	5351	const struct isp32_ldch_cfg *arg = &params->others.ldch_cfg;
5216	5352
5217	5353	for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
5218		- if (priv_val->buf_ldch[i].vaddr &&
5219		- arg->buf_fd == priv_val->buf_ldch[i].dma_fd) {
5220		- mesh_head = (struct isp2x_mesh_head *)priv_val->buf_ldch[i].vaddr;
	5354	+ if (priv_val->buf_ldch[id][i].vaddr &&
	5355	+ arg->buf_fd == priv_val->buf_ldch[id][i].dma_fd) {
	5356	+ mesh_head = (struct isp2x_mesh_head *)priv_val->buf_ldch[id][i].vaddr;
5221	5357	mesh_head->stat = MESH_BUF_CHIPINUSE;
5222	5358	break;
5223	5359	}
..	..	@@ -5228,9 +5364,9 @@
5228	5364	const struct isp32_cac_cfg *arg = &params->others.cac_cfg;
5229	5365
5230	5366	for (i = 0; i < ISP32_MESH_BUF_NUM; i++) {
5231		- if (priv_val->buf_cac[i].vaddr &&
5232		- arg->buf_fd == priv_val->buf_cac[i].dma_fd) {
5233		- mesh_head = (struct isp2x_mesh_head *)priv_val->buf_cac[i].vaddr;
	5367	+ if (priv_val->buf_cac[id][i].vaddr &&
	5368	+ arg->buf_fd == priv_val->buf_cac[id][i].dma_fd) {
	5369	+ mesh_head = (struct isp2x_mesh_head *)priv_val->buf_cac[id][i].vaddr;
5234	5370	mesh_head->stat = MESH_BUF_CHIPINUSE;
5235	5371	break;
5236	5372	}
..	..	@@ -5242,10 +5378,9 @@
5242	5378	rkisp_params_cfg_v32(struct rkisp_isp_params_vdev *params_vdev,
5243	5379	u32 frame_id, enum rkisp_params_type type)
5244	5380	{
	5381	+ struct rkisp_hw_dev *hw = params_vdev->dev->hw_dev;
5245	5382	struct isp32_isp_params_cfg *new_params = NULL;
5246	5383	struct rkisp_buffer *cur_buf = params_vdev->cur_buf;
5247		- struct rkisp_device *dev = params_vdev->dev;
5248		- struct rkisp_hw_dev *hw_dev = dev->hw_dev;
5249	5384
5250	5385	spin_lock(&params_vdev->config_lock);
5251	5386	if (!params_vdev->streamon)
..	..	@@ -5264,15 +5399,27 @@
5264	5399	else if (new_params->module_en_update \|\|
5265	5400	(new_params->module_cfg_update & ISP32_MODULE_FORCE)) {
5266	5401	/* update en immediately */
5267		- __isp_isr_meas_config(params_vdev, new_params, type);
5268		- __isp_isr_other_config(params_vdev, new_params, type);
5269		- __isp_isr_other_en(params_vdev, new_params, type);
5270		- __isp_isr_meas_en(params_vdev, new_params, type);
	5402	+ __isp_isr_meas_config(params_vdev, new_params, type, 0);
	5403	+ __isp_isr_other_config(params_vdev, new_params, type, 0);
	5404	+ __isp_isr_other_en(params_vdev, new_params, type, 0);
	5405	+ __isp_isr_meas_en(params_vdev, new_params, type, 0);
5271	5406	new_params->module_cfg_update = 0;
	5407	+ if (hw->unite) {
	5408	+ struct isp32_isp_params_cfg *params = new_params + 1;
	5409	+
	5410	+ __isp_isr_meas_config(params_vdev, params, type, 1);
	5411	+ __isp_isr_other_config(params_vdev, params, type, 1);
	5412	+ __isp_isr_other_en(params_vdev, params, type, 1);
	5413	+ __isp_isr_meas_en(params_vdev, params, type, 1);
	5414	+ params->module_cfg_update = 0;
	5415	+ }
5272	5416	}
5273	5417	if (new_params->module_cfg_update &
5274	5418	(ISP32_MODULE_LDCH \| ISP32_MODULE_CAC)) {
5275		- module_data_abandon(params_vdev, new_params);
	5419	+ module_data_abandon(params_vdev, new_params, 0);
	5420	+ if (hw->unite)
	5421	+ module_data_abandon(params_vdev, new_params, 1);
	5422	+
5276	5423	}
5277	5424	vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
5278	5425	cur_buf = NULL;
..	..	@@ -5289,22 +5436,21 @@
5289	5436	goto unlock;
5290	5437
5291	5438	new_params = (struct isp32_isp_params_cfg *)(cur_buf->vaddr[0]);
5292		- __isp_isr_meas_config(params_vdev, new_params, type);
5293		- __isp_isr_other_config(params_vdev, new_params, type);
5294		- __isp_isr_other_en(params_vdev, new_params, type);
5295		- __isp_isr_meas_en(params_vdev, new_params, type);
5296		- if (!hw_dev->is_single && type != RKISP_PARAMS_SHD)
5297		- __isp_config_hdrshd(params_vdev);
	5439	+ if (hw->unite) {
	5440	+ __isp_isr_meas_config(params_vdev, new_params + 1, type, 1);
	5441	+ __isp_isr_other_config(params_vdev, new_params + 1, type, 1);
	5442	+ __isp_isr_other_en(params_vdev, new_params + 1, type, 1);
	5443	+ __isp_isr_meas_en(params_vdev, new_params + 1, type, 1);
	5444	+ }
	5445	+ __isp_isr_meas_config(params_vdev, new_params, type, 0);
	5446	+ __isp_isr_other_config(params_vdev, new_params, type, 0);
	5447	+ __isp_isr_other_en(params_vdev, new_params, type, 0);
	5448	+ __isp_isr_meas_en(params_vdev, new_params, type, 0);
5298	5449
5299	5450	if (type != RKISP_PARAMS_IMD) {
5300		- struct rkisp_isp_params_val_v32 *priv_val =
5301		- (struct rkisp_isp_params_val_v32 *)params_vdev->priv_val;
5302		-
5303		- priv_val->last_hdrmge = priv_val->cur_hdrmge;
5304		- priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
5305		- priv_val->cur_hdrmge = new_params->others.hdrmge_cfg;
5306		- priv_val->cur_hdrdrc = new_params->others.drc_cfg;
5307	5451	new_params->module_cfg_update = 0;
	5452	+ if (hw->unite)
	5453	+ (new_params++)->module_cfg_update = 0;
5308	5454	vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
5309	5455	cur_buf = NULL;
5310	5456	}
..	..	@@ -5317,13 +5463,15 @@
5317	5463	static void
5318	5464	rkisp_params_clear_fstflg(struct rkisp_isp_params_vdev *params_vdev)
5319	5465	{
5320		- u32 value = isp3_param_read(params_vdev, ISP3X_ISP_CTRL1);
	5466	+ u32 value = isp3_param_read(params_vdev, ISP3X_ISP_CTRL1, 0);
5321	5467
5322	5468	value &= (ISP3X_YNR_FST_FRAME \| ISP3X_ADRC_FST_FRAME \|
5323	5469	ISP3X_DHAZ_FST_FRAME \| ISP3X_CNR_FST_FRAME \|
5324		- ISP3X_RAW3D_FST_FRAME);
	5470	+ ISP3X_RAW3D_FST_FRAME \| ISP32_SHP_FST_FRAME);
5325	5471	if (value) {
5326		- isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL1, value);
	5472	+ isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL1, value, 0);
	5473	+ if (params_vdev->dev->hw_dev->unite)
	5474	+ isp3_param_clear_bits(params_vdev, ISP3X_ISP_CTRL1, value, 1);
5327	5475	}
5328	5476	}
5329	5477
..	..	@@ -5382,6 +5530,8 @@
5382	5530	return -ENOMEM;
5383	5531
5384	5532	size = sizeof(struct isp32_isp_params_cfg);
	5533	+ if (params_vdev->dev->hw_dev->unite)
	5534	+ size *= 2;
5385	5535	params_vdev->isp32_params = vmalloc(size);
5386	5536	if (!params_vdev->isp32_params) {
5387	5537	kfree(priv_val);