update kernel to 5.10.198

hc

2024-01-03 2f7c68cb55ecb7331f2381deb497c27155f32faf

 kernel/drivers/media/platform/rockchip/isp/regs.c
..
..
@@ -45,8 +45,7 @@
45
45
 
46
46
 	if (async && dev->hw_dev->is_single)
47
47
 		val = CIF_DUAL_CROP_GEN_CFG_UPD;
48
-	rkisp_unite_set_bits(dev, stream->config->dual_crop.ctrl,
49
-			     mask, val, false, dev->hw_dev->is_unite);
48
+	rkisp_unite_set_bits(dev, stream->config->dual_crop.ctrl, mask, val, false);
50
49
 }
51
50
 
52
51
 void rkisp_config_dcrop(struct rkisp_stream *stream,
..
..
@@ -54,7 +53,7 @@
54
53
 {
55
54
 	struct rkisp_device *dev = stream->ispdev;
56
55
 	u32 val = stream->config->dual_crop.yuvmode_mask;
57
-	bool is_unite = dev->hw_dev->is_unite;
56
+	bool is_unite = !!dev->hw_dev->unite;
58
57
 	struct v4l2_rect tmp = *rect;
59
58
 	u32 reg;
60
59
 
..
..
@@ -69,9 +68,9 @@
69
68
 	rkisp_write(dev, reg, tmp.width, false);
70
69
 
71
70
 	reg = stream->config->dual_crop.v_offset;
72
-	rkisp_unite_write(dev, reg, tmp.top, false, is_unite);
71
+	rkisp_unite_write(dev, reg, tmp.top, false);
73
72
 	reg = stream->config->dual_crop.v_size;
74
-	rkisp_unite_write(dev, reg, tmp.height, false, is_unite);
73
+	rkisp_unite_write(dev, reg, tmp.height, false);
75
74
 
76
75
 	if (async && dev->hw_dev->is_single)
77
76
 		val |= CIF_DUAL_CROP_GEN_CFG_UPD;
..
..
@@ -149,8 +148,7 @@
149
148
 
150
149
 	if (async && dev->hw_dev->is_single)
151
150
 		val = CIF_RSZ_CTRL_CFG_UPD_AUTO;
152
-	rkisp_unite_set_bits(dev, stream->config->rsz.ctrl, 0,
153
-			     val, false, dev->hw_dev->is_unite);
151
+	rkisp_unite_set_bits(dev, stream->config->rsz.ctrl, 0, val, false);
154
152
 }
155
153
 
156
154
 static void set_scale(struct rkisp_stream *stream, struct v4l2_rect *in_y,
..
..
@@ -220,17 +218,8 @@
220
218
 		rkisp_write(dev, scale_vc_addr, scale_vc, false);
221
219
 	}
222
220
 
223
-	if (dev->hw_dev->is_unite) {
224
-		u32 hy_size_reg = stream->id == RKISP_STREAM_MP ?
225
-			ISP3X_MAIN_RESIZE_HY_SIZE : ISP3X_SELF_RESIZE_HY_SIZE;
226
-		u32 hc_size_reg = stream->id == RKISP_STREAM_MP ?
227
-			ISP3X_MAIN_RESIZE_HC_SIZE : ISP3X_SELF_RESIZE_HC_SIZE;
228
-		u32 hy_offs_mi_reg = stream->id == RKISP_STREAM_MP ?
229
-			ISP3X_MAIN_RESIZE_HY_OFFS_MI : ISP3X_SELF_RESIZE_HY_OFFS_MI;
230
-		u32 hc_offs_mi_reg = stream->id == RKISP_STREAM_MP ?
231
-			ISP3X_MAIN_RESIZE_HC_OFFS_MI : ISP3X_SELF_RESIZE_HC_OFFS_MI;
232
-		u32 in_crop_offs_reg = stream->id == RKISP_STREAM_MP ?
233
-			ISP3X_MAIN_RESIZE_IN_CROP_OFFSET : ISP3X_SELF_RESIZE_IN_CROP_OFFSET;
221
+	if (dev->hw_dev->unite) {
222
+		u32 hy_size_reg, hc_size_reg, hy_offs_mi_reg, hc_offs_mi_reg, in_crop_offs_reg;
234
223
 		u32 isp_in_w = in_y->width / 2 + RKMOUDLE_UNITE_EXTEND_PIXEL;
235
224
 		u32 scl_w = out_y->width / 2;
236
225
 		u32 left_y = scale_hy == 1 ? scl_w : DIV_ROUND_UP(scl_w * 65536, scale_hy);
..
..
@@ -248,6 +237,34 @@
248
237
 		u32 extend = RKMOUDLE_UNITE_EXTEND_PIXEL;
249
238
 		u32 right_scl_in_y;
250
239
 		u32 right_scl_in_c;
240
+
241
+		switch (stream->id) {
242
+		case RKISP_STREAM_MP:
243
+			hy_size_reg = ISP3X_MAIN_RESIZE_HY_SIZE;
244
+			hc_size_reg = ISP3X_MAIN_RESIZE_HC_SIZE;
245
+			hy_offs_mi_reg = ISP3X_MAIN_RESIZE_HY_OFFS_MI;
246
+			hc_offs_mi_reg = ISP3X_MAIN_RESIZE_HC_OFFS_MI;
247
+			in_crop_offs_reg = ISP3X_MAIN_RESIZE_IN_CROP_OFFSET;
248
+			break;
249
+		case RKISP_STREAM_SP:
250
+			hy_size_reg = ISP3X_SELF_RESIZE_HY_SIZE;
251
+			hc_size_reg = ISP3X_SELF_RESIZE_HC_SIZE;
252
+			hy_offs_mi_reg = ISP3X_SELF_RESIZE_HY_OFFS_MI;
253
+			hc_offs_mi_reg = ISP3X_SELF_RESIZE_HC_OFFS_MI;
254
+			in_crop_offs_reg = ISP3X_SELF_RESIZE_IN_CROP_OFFSET;
255
+			break;
256
+		case RKISP_STREAM_BP:
257
+			hy_size_reg = ISP32_BP_RESIZE_HY_SIZE;
258
+			hc_size_reg = ISP32_BP_RESIZE_HC_SIZE;
259
+			hy_offs_mi_reg = ISP32_BP_RESIZE_HY_OFFS_MI;
260
+			hc_offs_mi_reg = ISP32_BP_RESIZE_HC_OFFS_MI;
261
+			in_crop_offs_reg = ISP32_BP_RESIZE_IN_CROP_OFFSET;
262
+			break;
263
+		default:
264
+			v4l2_warn(&dev->v4l2_dev, "%s no support unite for stream:%d\n",
265
+				  __func__, stream->id);
266
+			return;
267
+		}
251
268
 
252
269
 		if (right_crop_y < RKMOUDLE_UNITE_EXTEND_PIXEL) {
253
270
 			u32 reg;
..
..
@@ -362,7 +379,6 @@
362
379
 {
363
380
 	struct rkisp_device *dev = stream->ispdev;
364
381
 	int i = 0;
365
-	bool is_unite = dev->hw_dev->is_unite;
366
382
 
367
383
 	if (dev->isp_ver == ISP_V32_L && stream->id == RKISP_STREAM_SP) {
368
384
 		set_bilinear_scale(stream, in_y, in_c, out_y, out_c, async);
..
..
@@ -377,8 +393,8 @@
377
393
 
378
394
 	/* Linear interpolation */
379
395
 	for (i = 0; i < 64; i++) {
380
-		rkisp_unite_write(dev, stream->config->rsz.scale_lut_addr, i, true, is_unite);
381
-		rkisp_unite_write(dev, stream->config->rsz.scale_lut, i, true, is_unite);
396
+		rkisp_unite_write(dev, stream->config->rsz.scale_lut_addr, i, true);
397
+		rkisp_unite_write(dev, stream->config->rsz.scale_lut, i, true);
382
398
 	}
383
399
 
384
400
 	set_scale(stream, in_y, in_c, out_y, out_c);
..
..
@@ -388,9 +404,7 @@
388
404
 
389
405
 void rkisp_disable_rsz(struct rkisp_stream *stream, bool async)
390
406
 {
391
-	bool is_unite = stream->ispdev->hw_dev->is_unite;
392
-
393
-	rkisp_unite_write(stream->ispdev, stream->config->rsz.ctrl, 0, false, is_unite);
407
+	rkisp_unite_write(stream->ispdev, stream->config->rsz.ctrl, 0, false);
394
408
 	if (stream->ispdev->isp_ver == ISP_V32_L && stream->id == RKISP_STREAM_SP)
395
409
 		return;
396
410
 	update_rsz_shadow(stream, async);