kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/isp/isp_stats_v3x.c
..
..
@@ -1038,7 +1038,7 @@
1038
1038
 		ret |= ops->get_dhaz_stats(stats_vdev, cur_stat_buf, 0);
1039
1039
 	}
1040
1040
 
1041
-	if (stats_vdev->dev->hw_dev->is_unite) {
1041
+	if (stats_vdev->dev->hw_dev->unite) {
1042
1042
 		size *= 2;
1043
1043
 		if (cur_buf) {
1044
1044
 			cur_stat_buf++;
..
..
@@ -1086,7 +1086,7 @@
1086
1086
 {
1087
1087
 	struct rkisp_device *dev = stats_vdev->dev;
1088
1088
 	struct rkisp_hw_dev *hw = dev->hw_dev;
1089
-	void __iomem *base = !hw->is_unite ?
1089
+	void __iomem *base = hw->unite != ISP_UNITE_TWO ?
1090
1090
 		hw->base_addr : hw->base_next_addr;
1091
1091
 	struct rkisp_isp_readout_work work;
1092
1092
 	u32 iq_isr_mask = ISP3X_SIAWB_DONE | ISP3X_SIAF_FIN |
..
..
@@ -1138,7 +1138,7 @@
1138
1138
 
1139
1139
 		rkisp_write(dev, ISP3X_MI_3A_WR_BASE,
1140
1140
 			    stats_vdev->stats_buf[wr_buf_idx].dma_addr, false);
1141
-		if (dev->hw_dev->is_unite)
1141
+		if (dev->hw_dev->unite)
1142
1142
 			rkisp_next_write(dev, ISP3X_MI_3A_WR_BASE,
1143
1143
 					 stats_vdev->stats_buf[wr_buf_idx].dma_addr +
1144
1144
 					 ISP3X_RD_STATS_BUF_SIZE, false);
..
..
@@ -1178,7 +1178,7 @@
1178
1178
 void rkisp_stats_first_ddr_config_v3x(struct rkisp_isp_stats_vdev *stats_vdev)
1179
1179
 {
1180
1180
 	struct rkisp_device *dev = stats_vdev->dev;
1181
-	int i, mult = dev->hw_dev->is_unite ? 2 : 1;
1181
+	int i, mult = dev->hw_dev->unite ? 2 : 1;
1182
1182
 
1183
1183
 	if (dev->isp_sdev.in_fmt.fmt_type == FMT_YUV)
1184
1184
 		return;
..
..
@@ -1199,14 +1199,12 @@
1199
1199
 	stats_vdev->wr_buf_idx = 0;
1200
1200
 
1201
1201
 	rkisp_unite_write(dev, ISP3X_MI_DBR_WR_SIZE,
1202
-			  ISP3X_RD_STATS_BUF_SIZE,
1203
-			  false, dev->hw_dev->is_unite);
1202
+			  ISP3X_RD_STATS_BUF_SIZE, false);
1204
1203
 	rkisp_unite_set_bits(dev, ISP3X_SWS_CFG, 0,
1205
-			     ISP3X_3A_DDR_WRITE_EN, false,
1206
-			     dev->hw_dev->is_unite);
1204
+			     ISP3X_3A_DDR_WRITE_EN, false);
1207
1205
 	rkisp_write(dev, ISP3X_MI_3A_WR_BASE,
1208
1206
 		    stats_vdev->stats_buf[0].dma_addr, false);
1209
-	if (dev->hw_dev->is_unite)
1207
+	if (dev->hw_dev->unite)
1210
1208
 		rkisp_next_write(dev, ISP3X_MI_3A_WR_BASE,
1211
1209
 				 stats_vdev->stats_buf[0].dma_addr +
1212
1210
 				 ISP3X_RD_STATS_BUF_SIZE, false);
..
..
@@ -1220,7 +1218,7 @@
1220
1218
 
1221
1219
 void rkisp_init_stats_vdev_v3x(struct rkisp_isp_stats_vdev *stats_vdev)
1222
1220
 {
1223
-	int mult = stats_vdev->dev->hw_dev->is_unite ? 2 : 1;
1221
+	int mult = stats_vdev->dev->hw_dev->unite ? 2 : 1;
1224
1222
 
1225
1223
 	stats_vdev->vdev_fmt.fmt.meta.dataformat =
1226
1224
 		V4L2_META_FMT_RK_ISP1_STAT_3A;