kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 kernel/drivers/media/platform/rockchip/isp/dmarx.c
..
..
@@ -318,7 +318,6 @@
318
318
 static int rawrd_config_mi(struct rkisp_stream *stream)
319
319
 {
320
320
 	struct rkisp_device *dev = stream->ispdev;
321
-	bool is_unite = dev->hw_dev->is_unite;
322
321
 	u32 val;
323
322
 
324
323
 	val = rkisp_read(dev, CSI2RX_DATA_IDS_1, true);
..
..
@@ -348,8 +347,8 @@
348
347
 		val |= CIF_CSI2_DT_RAW12;
349
348
 	}
350
349
 	rkisp_unite_write(dev, CSI2RX_RAW_RD_CTRL,
351
-			  stream->memory << 2, false, is_unite);
352
-	rkisp_unite_write(dev, CSI2RX_DATA_IDS_1, val, false, is_unite);
350
+			  stream->memory << 2, false);
351
+	rkisp_unite_write(dev, CSI2RX_DATA_IDS_1, val, false);
353
352
 	rkisp_rawrd_set_pic_size(dev, stream->out_fmt.width,
354
353
 				 stream->out_fmt.height);
355
354
 	mi_raw_length(stream);
..
..
@@ -376,7 +375,7 @@
376
375
 		}
377
376
 		val += stream->curr_buf->buff_addr[RKISP_PLANE_Y];
378
377
 		rkisp_write(dev, stream->config->mi.y_base_ad_init, val, false);
379
-		if (dev->hw_dev->is_unite) {
378
+		if (dev->hw_dev->unite) {
380
379
 			u32 offs = stream->out_fmt.width / 2 - RKMOUDLE_UNITE_EXTEND_PIXEL;
381
380
 
382
381
 			if (stream->memory)
..
..
@@ -464,13 +463,10 @@
464
463
 				}
465
464
 				dev->hdr.op_mode = dev->rd_mode;
466
465
 				rkisp_unite_write(dev, CSI2RX_CTRL0,
467
-						  SW_IBUF_OP_MODE(dev->hdr.op_mode),
468
-						  true, dev->hw_dev->is_unite);
466
+						  SW_IBUF_OP_MODE(dev->hdr.op_mode), true);
469
467
 				rkisp_unite_set_bits(dev, CSI2RX_MASK_STAT,
470
-						     0, ISP21_MIPI_DROP_FRM,
471
-						     true, dev->hw_dev->is_unite);
472
-				rkisp_unite_clear_bits(dev, CIF_ISP_IMSC, CIF_ISP_FRAME_IN,
473
-						       true, dev->hw_dev->is_unite);
468
+						     0, ISP21_MIPI_DROP_FRM, true);
469
+				rkisp_unite_clear_bits(dev, CIF_ISP_IMSC, CIF_ISP_FRAME_IN, true);
474
470
 				dev_info(dev->dev,
475
471
 					 "switch online seq:%d mode:0x%x\n",
476
472
 					 rx_buf->sequence, dev->rd_mode);
..
..
@@ -1135,7 +1131,7 @@
1135
1131
 {
1136
1132
 	struct rkisp_isp_subdev *sdev = &dev->isp_sdev;
1137
1133
 	u8 mult = sdev->in_fmt.fmt_type == FMT_YUV ? 2 : 1;
1138
-	bool is_unite = dev->hw_dev->is_unite;
1134
+	bool is_unite = !!dev->hw_dev->unite;
1139
1135
 	u32 w = !is_unite ? width : width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
1140
1136
 
1141
1137
 	/* rx height should equal to isp height + offset for read back mode */
..
..
@@ -1149,7 +1145,7 @@
1149
1145
 		height += RKMODULE_EXTEND_LINE;
1150
1146
 
1151
1147
 	w *= mult;
1152
-	rkisp_unite_write(dev, CSI2RX_RAW_RD_PIC_SIZE, height << 16 | w, false, is_unite);
1148
+	rkisp_unite_write(dev, CSI2RX_RAW_RD_PIC_SIZE, height << 16 | w, false);
1153
1149
 }
1154
1150
 
1155
1151
 void rkisp_dmarx_get_frame(struct rkisp_device *dev, u32 *id,