update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/rockchip/isp/isp_params_v3x.c
..
..
@@ -591,7 +591,7 @@
591
591
 	struct isp3x_isp_params_cfg *params = params_vdev->isp3x_params;
592
592
 
593
593
 	isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true, 0);
594
-	if (params_vdev->dev->hw_dev->is_unite) {
594
+	if (params_vdev->dev->hw_dev->unite) {
595
595
 		params++;
596
596
 		isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true, 1);
597
597
 	}
..
..
@@ -1223,7 +1223,7 @@
1223
1223
 
1224
1224
 	block_hsize = arg->win.h_size / ae_wnd_num[wnd_num_idx];
1225
1225
 	value = block_hsize * ae_wnd_num[wnd_num_idx] + arg->win.h_offs;
1226
-	if (ispdev->hw_dev->is_unite)
1226
+	if (ispdev->hw_dev->unite)
1227
1227
 		width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
1228
1228
 	if (value + 1 > width)
1229
1229
 		block_hsize -= 1;
..
..
@@ -1291,6 +1291,12 @@
1291
1291
 	value &= ISP3X_RAWAE_BIG_EN;
1292
1292
 
1293
1293
 	wnd_num_idx = arg->wnd_num;
1294
+	if (wnd_num_idx >= ARRAY_SIZE(ae_wnd_num)) {
1295
+		wnd_num_idx = ARRAY_SIZE(ae_wnd_num) - 1;
1296
+		dev_err(params_vdev->dev->dev,
1297
+			"%s invalid wnd_num:%d, set to %d\n",
1298
+			__func__, arg->wnd_num, wnd_num_idx);
1299
+	}
1294
1300
 	value |= ISP3X_RAWAE_BIG_WND0_NUM(wnd_num_idx);
1295
1301
 
1296
1302
 	if (arg->subwin_en[0])
..
..
@@ -1310,7 +1316,7 @@
1310
1316
 
1311
1317
 	block_hsize = arg->win.h_size / ae_wnd_num[wnd_num_idx];
1312
1318
 	value = block_hsize * ae_wnd_num[wnd_num_idx] + arg->win.h_offs;
1313
-	if (ispdev->hw_dev->is_unite)
1319
+	if (ispdev->hw_dev->unite)
1314
1320
 		width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
1315
1321
 	if (value + 1 > width)
1316
1322
 		block_hsize -= 1;
..
..
@@ -1430,13 +1436,12 @@
1430
1436
 		return;
1431
1437
 
1432
1438
 	for (i = 0; i < ISP3X_RAWAWB_WEIGHT_NUM / 5; i++) {
1433
-		isp3_param_write(params_vdev,
1434
-				 (arg->sw_rawawb_wp_blk_wei_w[5 * i] & 0x3f) << 0 |
1435
-				 (arg->sw_rawawb_wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 |
1436
-				 (arg->sw_rawawb_wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 |
1437
-				 (arg->sw_rawawb_wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 |
1438
-				 (arg->sw_rawawb_wp_blk_wei_w[5 * i + 4] & 0x3f) << 24,
1439
-				 ISP3X_RAWAWB_WRAM_DATA_BASE, id);
1439
+		val = (arg->sw_rawawb_wp_blk_wei_w[5 * i] & 0x3f) << 0 |
1440
+		      (arg->sw_rawawb_wp_blk_wei_w[5 * i + 1] & 0x3f) << 6 |
1441
+		      (arg->sw_rawawb_wp_blk_wei_w[5 * i + 2] & 0x3f) << 12 |
1442
+		      (arg->sw_rawawb_wp_blk_wei_w[5 * i + 3] & 0x3f) << 18 |
1443
+		      (arg->sw_rawawb_wp_blk_wei_w[5 * i + 4] & 0x3f) << 24;
1444
+		isp3_param_write_direct(params_vdev, val, ISP3X_RAWAWB_WRAM_DATA_BASE, id);
1440
1445
 	}
1441
1446
 }
1442
1447
 
..
..
@@ -2288,10 +2293,9 @@
2288
2293
 
2289
2294
 	if (params_vdev->dev->hw_dev->is_single)
2290
2295
 		isp_rawawb_cfg_sram(params_vdev, arg, false, id);
2291
-	else
2292
-		memcpy(arg_rec->sw_rawawb_wp_blk_wei_w,
2293
-		       arg->sw_rawawb_wp_blk_wei_w,
2294
-		       ISP3X_RAWAWB_WEIGHT_NUM);
2296
+	memcpy(arg_rec->sw_rawawb_wp_blk_wei_w,
2297
+	       arg->sw_rawawb_wp_blk_wei_w,
2298
+	       ISP3X_RAWAWB_WEIGHT_NUM);
2295
2299
 
2296
2300
 	/* avoid to override the old enable value */
2297
2301
 	value = isp3_param_read(params_vdev, ISP3X_RAWAWB_CTRL, id);
..
..
@@ -2426,6 +2430,12 @@
2426
2430
 		return;
2427
2431
 
2428
2432
 	wnd_num_idx = arg->wnd_num;
2433
+	if (wnd_num_idx >= ARRAY_SIZE(hist_wnd_num)) {
2434
+		wnd_num_idx = ARRAY_SIZE(hist_wnd_num) - 1;
2435
+		dev_err(params_vdev->dev->dev,
2436
+			"%s invalid wnd_num:%d, set to %d\n",
2437
+			__func__, arg->wnd_num, wnd_num_idx);
2438
+	}
2429
2439
 	memset(weight15x15, 0, sizeof(weight15x15));
2430
2440
 	for (i = 0; i < hist_wnd_num[wnd_num_idx]; i++) {
2431
2441
 		for (j = 0; j < hist_wnd_num[wnd_num_idx]; j++) {
..
..
@@ -2473,6 +2483,12 @@
2473
2483
 	}
2474
2484
 
2475
2485
 	wnd_num_idx = arg->wnd_num;
2486
+	if (wnd_num_idx >= ARRAY_SIZE(hist_wnd_num)) {
2487
+		wnd_num_idx = ARRAY_SIZE(hist_wnd_num) - 1;
2488
+		dev_err(params_vdev->dev->dev,
2489
+			"%s invalid wnd_num:%d, set to %d\n",
2490
+			__func__, arg->wnd_num, wnd_num_idx);
2491
+	}
2476
2492
 	/* avoid to override the old enable value */
2477
2493
 	hist_ctrl = isp3_param_read(params_vdev, addr + ISP3X_RAWHIST_BIG_CTRL, id);
2478
2494
 	hist_ctrl &= ISP3X_RAWHIST_EN;
..
..
@@ -2502,8 +2518,7 @@
2502
2518
 
2503
2519
 	if (dev->hw_dev->is_single)
2504
2520
 		isp_rawhstbig_cfg_sram(params_vdev, arg, blk_no, false, id);
2505
-	else
2506
-		*arg_rec = *arg;
2521
+	*arg_rec = *arg;
2507
2522
 }
2508
2523
 
2509
2524
 static void
..
..
@@ -2887,7 +2902,7 @@
2887
2902
 	value = ISP_PACK_2SHORT(arg->sigma_lut[i * 2], 0);
2888
2903
 	isp3_param_write(params_vdev, value, ISP3X_DHAZ_GAIN_LUT0 + i * 4, id);
2889
2904
 
2890
-	if (dev->hw_dev->is_unite &&
2905
+	if (dev->hw_dev->unite &&
2891
2906
 	    dev->hw_dev->is_single &&
2892
2907
 	    ctrl & ISP3X_DHAZ_ENMUX)
2893
2908
 		ctrl |= ISP3X_SELF_FORCE_UPD;
..
..
@@ -4095,22 +4110,6 @@
4095
4110
 		ops->rawawb_enable(params_vdev, !!(module_ens & ISP3X_MODULE_RAWAWB), id);
4096
4111
 }
4097
4112
 
4098
-static __maybe_unused
4099
-void __isp_config_hdrshd(struct rkisp_isp_params_vdev *params_vdev)
4100
-{
4101
-	struct rkisp_isp_params_ops_v3x *ops =
4102
-		(struct rkisp_isp_params_ops_v3x *)params_vdev->priv_ops;
4103
-	struct rkisp_isp_params_val_v3x *priv_val =
4104
-		(struct rkisp_isp_params_val_v3x *)params_vdev->priv_val;
4105
-
4106
-	if (params_vdev->dev->hw_dev->is_unite) {
4107
-		ops->hdrmge_config(params_vdev, &priv_val->last_hdrmge, RKISP_PARAMS_SHD, 1);
4108
-		ops->hdrdrc_config(params_vdev, &priv_val->last_hdrdrc, RKISP_PARAMS_SHD, 1);
4109
-	}
4110
-	ops->hdrmge_config(params_vdev, &priv_val->last_hdrmge, RKISP_PARAMS_SHD, 0);
4111
-	ops->hdrdrc_config(params_vdev, &priv_val->last_hdrdrc, RKISP_PARAMS_SHD, 0);
4112
-}
4113
-
4114
4113
 static
4115
4114
 void rkisp_params_cfgsram_v3x(struct rkisp_isp_params_vdev *params_vdev)
4116
4115
 {
..
..
@@ -4121,7 +4120,7 @@
4121
4120
 	isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist2, 2, true, 0);
4122
4121
 	isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist3, 0, true, 0);
4123
4122
 	isp_rawawb_cfg_sram(params_vdev, &params->meas.rawawb, true, 0);
4124
-	if (params_vdev->dev->hw_dev->is_unite) {
4123
+	if (params_vdev->dev->hw_dev->unite) {
4125
4124
 		params++;
4126
4125
 		isp_lsc_matrix_cfg_sram(params_vdev, &params->others.lsc_cfg, true, 1);
4127
4126
 		isp_rawhstbig_cfg_sram(params_vdev, &params->meas.rawhist1, 1, true, 1);
..
..
@@ -4145,7 +4144,7 @@
4145
4144
 	module_en_update = new_params->module_en_update;
4146
4145
 	module_ens = new_params->module_ens;
4147
4146
 
4148
-	for (id = 0; id <= ispdev->hw_dev->is_unite; id++) {
4147
+	for (id = 0; id <= !!ispdev->hw_dev->unite; id++) {
4149
4148
 		priv_val->buf_3dlut_idx[id] = 0;
4150
4149
 		for (i = 0; i < ISP3X_3DLUT_BUF_NUM; i++) {
4151
4150
 			priv_val->buf_3dlut[id][i].is_need_vaddr = true;
..
..
@@ -4162,10 +4161,10 @@
4162
4161
 	    (module_ens & ISP3X_MODULE_BAY3D)) {
4163
4162
 		w = ALIGN(isp_sdev->in_crop.width, 16);
4164
4163
 		h = ALIGN(isp_sdev->in_crop.height, 16);
4165
-		if (ispdev->hw_dev->is_unite)
4164
+		if (ispdev->hw_dev->unite)
4166
4165
 			w = ALIGN(isp_sdev->in_crop.width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL, 16);
4167
4166
 
4168
-		for (id = 0; id <= ispdev->hw_dev->is_unite; id++) {
4167
+		for (id = 0; id <= !!ispdev->hw_dev->unite; id++) {
4169
4168
 			size = ALIGN((w + w / 8) * h * 2, 16);
4170
4169
 
4171
4170
 			priv_val->buf_3dnr_iir[id].size = size;
..
..
@@ -4201,7 +4200,7 @@
4201
4200
 		rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_cur[id]);
4202
4201
 		rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_ds[id]);
4203
4202
 	}
4204
-	id = ispdev->hw_dev->is_unite ? 1 : 0;
4203
+	id = ispdev->hw_dev->unite ? 1 : 0;
4205
4204
 	i = ISP3X_3DLUT_BUF_NUM;
4206
4205
 err_3dlut:
4207
4206
 	for (; id >= 0; id--) {
..
..
@@ -4256,7 +4255,7 @@
4256
4255
 				continue;
4257
4256
 			dev_warn(dev, "isp%d %dx%d over four vir isp max:%dx1536\n",
4258
4257
 				 i, hw->isp_size[i].w, hw->isp_size[i].h,
4259
-				 hw->is_unite ? (2560 - RKMOUDLE_UNITE_EXTEND_PIXEL) * 2 : 2560);
4258
+				 hw->unite ? (2560 - RKMOUDLE_UNITE_EXTEND_PIXEL) * 2 : 2560);
4260
4259
 			hw->is_multi_overflow = true;
4261
4260
 			goto multi_overflow;
4262
4261
 		}
..
..
@@ -4298,7 +4297,7 @@
4298
4297
 			    (hw->isp_size[idx1[0]].size > ISP3X_VIR2_MAX_SIZE)) {
4299
4298
 				dev_warn(dev, "isp%d %dx%d over three vir isp max:%dx1536\n",
4300
4299
 					 idx1[0], hw->isp_size[idx1[0]].w, hw->isp_size[idx1[0]].h,
4301
-					 hw->is_unite ? (2560 - RKMOUDLE_UNITE_EXTEND_PIXEL) * 2 : 2560);
4300
+					 hw->unite ? (2560 - RKMOUDLE_UNITE_EXTEND_PIXEL) * 2 : 2560);
4302
4301
 				hw->is_multi_overflow = true;
4303
4302
 				goto multi_overflow;
4304
4303
 			} else {
..
..
@@ -4357,7 +4356,7 @@
4357
4356
 			    hw->isp_size[idx1[k - 1]].size > (ISP3X_VIR4_MAX_SIZE + ISP3X_VIR2_MAX_SIZE)) {
4358
4357
 				dev_warn(dev, "isp%d %dx%d over two vir isp max:%dx2160\n",
4359
4358
 					 idx1[k - 1], hw->isp_size[idx1[k - 1]].w, hw->isp_size[idx1[k - 1]].h,
4360
-					 hw->is_unite ? (3840 - RKMOUDLE_UNITE_EXTEND_PIXEL) * 2 : 3840);
4359
+					 hw->unite ? (3840 - RKMOUDLE_UNITE_EXTEND_PIXEL) * 2 : 3840);
4361
4360
 				hw->is_multi_overflow = true;
4362
4361
 				goto multi_overflow;
4363
4362
 			} else {
..
..
@@ -4379,7 +4378,7 @@
4379
4378
 		ispdev->multi_mode = 0;
4380
4379
 		ispdev->multi_index = 0;
4381
4380
 		width = crop->width;
4382
-		if (hw->is_unite)
4381
+		if (hw->unite)
4383
4382
 			width = width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
4384
4383
 		height = crop->height;
4385
4384
 		size = width * height;
..
..
@@ -4416,7 +4415,7 @@
4416
4415
 	priv_val->lsc_en = 0;
4417
4416
 	priv_val->mge_en = 0;
4418
4417
 	priv_val->lut3d_en = 0;
4419
-	if (hw->is_unite) {
4418
+	if (hw->unite) {
4420
4419
 		if (dev->is_bigmode)
4421
4420
 			rkisp_next_set_bits(params_vdev->dev, ISP3X_ISP_CTRL1, 0,
4422
4421
 					    ISP3X_BIGMODE_MANUAL | ISP3X_BIGMODE_FORCE_EN, false);
..
..
@@ -4432,11 +4431,6 @@
4432
4431
 	__isp_isr_other_config(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 0);
4433
4432
 	__isp_isr_other_en(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 0);
4434
4433
 	__isp_isr_meas_en(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 0);
4435
-
4436
-	priv_val->cur_hdrmge = params_vdev->isp3x_params->others.hdrmge_cfg;
4437
-	priv_val->cur_hdrdrc = params_vdev->isp3x_params->others.drc_cfg;
4438
-	priv_val->last_hdrmge = priv_val->cur_hdrmge;
4439
-	priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
4440
4434
 	spin_unlock(&params_vdev->config_lock);
4441
4435
 }
4442
4436
 
..
..
@@ -4452,7 +4446,7 @@
4452
4446
 
4453
4447
 static void rkisp_clear_first_param_v3x(struct rkisp_isp_params_vdev *params_vdev)
4454
4448
 {
4455
-	u32 mult = params_vdev->dev->hw_dev->is_unite ? ISP3_UNITE_MAX : 1;
4449
+	u32 mult = params_vdev->dev->hw_dev->unite ? ISP3_UNITE_MAX : 1;
4456
4450
 	u32 size = sizeof(struct isp3x_isp_params_cfg) * mult;
4457
4451
 
4458
4452
 	memset(params_vdev->isp3x_params, 0, size);
..
..
@@ -4551,7 +4545,7 @@
4551
4545
 rkisp_get_param_size_v3x(struct rkisp_isp_params_vdev *params_vdev,
4552
4546
 			 unsigned int sizes[])
4553
4547
 {
4554
-	u32 mult = params_vdev->dev->hw_dev->is_unite ? ISP3_UNITE_MAX : 1;
4548
+	u32 mult = params_vdev->dev->hw_dev->unite ? ISP3_UNITE_MAX : 1;
4555
4549
 
4556
4550
 	sizes[0] = sizeof(struct isp3x_isp_params_cfg) * mult;
4557
4551
 }
..
..
@@ -4596,7 +4590,7 @@
4596
4590
 {
4597
4591
 	struct rkisp_meshbuf_size *meshsize = size;
4598
4592
 
4599
-	if (!params_vdev->dev->hw_dev->is_unite)
4593
+	if (!params_vdev->dev->hw_dev->unite)
4600
4594
 		meshsize->unite_isp_id = 0;
4601
4595
 	rkisp_deinit_mesh_buf(params_vdev, meshsize->module_id, meshsize->unite_isp_id);
4602
4596
 	return rkisp_init_mesh_buf(params_vdev, meshsize);
..
..
@@ -4608,7 +4602,7 @@
4608
4602
 {
4609
4603
 	int id;
4610
4604
 
4611
-	for (id = 0; id <= params_vdev->dev->hw_dev->is_unite; id++)
4605
+	for (id = 0; id <= !!params_vdev->dev->hw_dev->unite; id++)
4612
4606
 		rkisp_deinit_mesh_buf(params_vdev, module_id, id);
4613
4607
 }
4614
4608
 
..
..
@@ -4621,7 +4615,7 @@
4621
4615
 
4622
4616
 	priv_val = (struct rkisp_isp_params_val_v3x *)params_vdev->priv_val;
4623
4617
 	tasklet_disable(&priv_val->lsc_tasklet);
4624
-	for (id = 0; id <= ispdev->hw_dev->is_unite; id++) {
4618
+	for (id = 0; id <= !!ispdev->hw_dev->unite; id++) {
4625
4619
 		rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_iir[id]);
4626
4620
 		rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_cur[id]);
4627
4621
 		rkisp_free_buffer(ispdev, &priv_val->buf_3dnr_ds[id]);
..
..
@@ -4637,7 +4631,7 @@
4637
4631
 {
4638
4632
 	int id;
4639
4633
 
4640
-	for (id = 0; id <= params_vdev->dev->hw_dev->is_unite; id++) {
4634
+	for (id = 0; id <= !!params_vdev->dev->hw_dev->unite; id++) {
4641
4635
 		rkisp_deinit_mesh_buf(params_vdev, ISP3X_MODULE_LDCH, id);
4642
4636
 		rkisp_deinit_mesh_buf(params_vdev, ISP3X_MODULE_CAC, id);
4643
4637
 	}
..
..
@@ -4652,7 +4646,7 @@
4652
4646
 
4653
4647
 	__isp_isr_other_en(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 0);
4654
4648
 	__isp_isr_meas_en(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 0);
4655
-	if (params_vdev->dev->hw_dev->is_unite) {
4649
+	if (params_vdev->dev->hw_dev->unite) {
4656
4650
 		__isp_isr_other_en(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 1);
4657
4651
 		__isp_isr_meas_en(params_vdev, params_vdev->isp3x_params, RKISP_PARAMS_ALL, 1);
4658
4652
 	}
..
..
@@ -4725,7 +4719,7 @@
4725
4719
 				__isp_isr_other_en(params_vdev, new_params, type, 0);
4726
4720
 				__isp_isr_meas_en(params_vdev, new_params, type, 0);
4727
4721
 				new_params->module_cfg_update = 0;
4728
-				if (hw_dev->is_unite) {
4722
+				if (hw_dev->unite) {
4729
4723
 					struct isp3x_isp_params_cfg *params = new_params + 1;
4730
4724
 
4731
4725
 					__isp_isr_meas_config(params_vdev, params, type, 1);
..
..
@@ -4738,7 +4732,7 @@
4738
4732
 			if (new_params->module_cfg_update &
4739
4733
 			    (ISP3X_MODULE_LDCH | ISP3X_MODULE_CAC)) {
4740
4734
 				module_data_abandon(params_vdev, new_params, 0);
4741
-				if (hw_dev->is_unite)
4735
+				if (hw_dev->unite)
4742
4736
 					module_data_abandon(params_vdev, new_params, 1);
4743
4737
 			}
4744
4738
 			vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
..
..
@@ -4756,7 +4750,7 @@
4756
4750
 		goto unlock;
4757
4751
 
4758
4752
 	new_params = (struct isp3x_isp_params_cfg *)(cur_buf->vaddr[0]);
4759
-	if (hw_dev->is_unite) {
4753
+	if (hw_dev->unite) {
4760
4754
 		__isp_isr_meas_config(params_vdev, new_params + 1, type, 1);
4761
4755
 		__isp_isr_other_config(params_vdev, new_params + 1, type, 1);
4762
4756
 		__isp_isr_other_en(params_vdev, new_params + 1, type, 1);
..
..
@@ -4766,19 +4760,10 @@
4766
4760
 	__isp_isr_other_config(params_vdev, new_params, type, 0);
4767
4761
 	__isp_isr_other_en(params_vdev, new_params, type, 0);
4768
4762
 	__isp_isr_meas_en(params_vdev, new_params, type, 0);
4769
-	if (!hw_dev->is_single && type != RKISP_PARAMS_SHD)
4770
-		__isp_config_hdrshd(params_vdev);
4771
4763
 
4772
4764
 	if (type != RKISP_PARAMS_IMD) {
4773
-		struct rkisp_isp_params_val_v3x *priv_val =
4774
-			(struct rkisp_isp_params_val_v3x *)params_vdev->priv_val;
4775
-
4776
-		priv_val->last_hdrmge = priv_val->cur_hdrmge;
4777
-		priv_val->last_hdrdrc = priv_val->cur_hdrdrc;
4778
-		priv_val->cur_hdrmge = new_params->others.hdrmge_cfg;
4779
-		priv_val->cur_hdrdrc = new_params->others.drc_cfg;
4780
4765
 		new_params->module_cfg_update = 0;
4781
-		if (hw_dev->is_unite)
4766
+		if (hw_dev->unite)
4782
4767
 			(new_params++)->module_cfg_update = 0;
4783
4768
 		vb2_buffer_done(&cur_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
4784
4769
 		cur_buf = NULL;
..
..
@@ -4812,7 +4797,7 @@
4812
4797
 	if (value & ISP3X_RAW3D_FST_FRAME)
4813
4798
 		rkisp_clear_bits(params_vdev->dev, ISP3X_ISP_CTRL1,
4814
4799
 				 ISP3X_RAW3D_FST_FRAME, false);
4815
-	if (hw_dev->is_unite) {
4800
+	if (hw_dev->unite) {
4816
4801
 		value = rkisp_next_read(dev, ISP3X_ISP_CTRL1, false);
4817
4802
 		if (value & ISP3X_YNR_FST_FRAME)
4818
4803
 			rkisp_next_clear_bits(params_vdev->dev, ISP3X_ISP_CTRL1,
..
..
@@ -4887,7 +4872,7 @@
4887
4872
 		return -ENOMEM;
4888
4873
 
4889
4874
 	size = sizeof(struct isp3x_isp_params_cfg);
4890
-	if (ispdev->hw_dev->is_unite)
4875
+	if (ispdev->hw_dev->unite)
4891
4876
 		size *= 2;
4892
4877
 	params_vdev->isp3x_params = vmalloc(size);
4893
4878
 	if (!params_vdev->isp3x_params) {