forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f 
 kernel/drivers/media/platform/rockchip/isp/capture_v21.c
....@@ -1206,6 +1206,9 @@
12061206 	unsigned long lock_flags = 0;
12071207 	int i = 0;
12081208 
1209
+	if (stream->id == RKISP_STREAM_VIR)
1210
+		return 0;
1211
+
12091212 	if (!stream->next_buf && stream->streaming &&
12101213 	    dev->dmarx_dev.trigger == T_MANUAL &&
12111214 	    is_rdbk_stream(stream))
....@@ -1218,6 +1221,7 @@
12181221 	    (!interlaced ||
12191222 	     (stream->u.sp.field_rec == RKISP_FIELD_ODD &&
12201223 	      stream->u.sp.field == RKISP_FIELD_EVEN))) {
1224
+		struct rkisp_stream *vir = &dev->cap_dev.stream[RKISP_STREAM_VIR];
12211225 		struct vb2_buffer *vb2_buf = &stream->curr_buf->vb.vb2_buf;
12221226 		u64 ns = 0;
12231227 
....@@ -1268,7 +1272,16 @@
12681272 				rdbk_frame_end(stream);
12691273 			}
12701274 		} else {
1271
-			rkisp_stream_buf_done(stream, stream->curr_buf);
1275
+			if (vir->streaming && vir->conn_id == stream->id) {
1276
+				spin_lock_irqsave(&vir->vbq_lock, lock_flags);
1277
+				list_add_tail(&stream->curr_buf->queue,
1278
+					      &dev->cap_dev.vir_cpy.queue);
1279
+				spin_unlock_irqrestore(&vir->vbq_lock, lock_flags);
1280
+				if (!completion_done(&dev->cap_dev.vir_cpy.cmpl))
1281
+					complete(&dev->cap_dev.vir_cpy.cmpl);
1282
+			} else {
1283
+				rkisp_stream_buf_done(stream, stream->curr_buf);
1284
+			}
12721285 		}
12731286 
12741287 		stream->curr_buf = NULL;
....@@ -1378,6 +1391,98 @@
13781391 		CIF_MI_CTRL_BURST_LEN_CHROM_16;
13791392 	stream->interlaced = false;
13801393 }
1394
+
1395
+static void vir_cpy_image(struct work_struct *work)
1396
+{
1397
+	struct rkisp_vir_cpy *cpy =
1398
+	container_of(work, struct rkisp_vir_cpy, work);
1399
+	struct rkisp_stream *vir = cpy->stream;
1400
+	struct rkisp_buffer *src_buf = NULL;
1401
+	unsigned long lock_flags = 0;
1402
+	u32 i;
1403
+
1404
+	v4l2_dbg(1, rkisp_debug, &vir->ispdev->v4l2_dev,
1405
+		 "%s enter\n", __func__);
1406
+
1407
+	vir->streaming = true;
1408
+	spin_lock_irqsave(&vir->vbq_lock, lock_flags);
1409
+	if (!list_empty(&cpy->queue)) {
1410
+		src_buf = list_first_entry(&cpy->queue,
1411
+				struct rkisp_buffer, queue);
1412
+		list_del(&src_buf->queue);
1413
+	}
1414
+	spin_unlock_irqrestore(&vir->vbq_lock, lock_flags);
1415
+
1416
+	while (src_buf || vir->streaming) {
1417
+		if (vir->stopping || !vir->streaming)
1418
+			goto end;
1419
+
1420
+		if (!src_buf)
1421
+			wait_for_completion(&cpy->cmpl);
1422
+
1423
+		vir->frame_end = false;
1424
+		spin_lock_irqsave(&vir->vbq_lock, lock_flags);
1425
+
1426
+		if (!src_buf && !list_empty(&cpy->queue)) {
1427
+			src_buf = list_first_entry(&cpy->queue,
1428
+					struct rkisp_buffer, queue);
1429
+			list_del(&src_buf->queue);
1430
+		}
1431
+
1432
+		if (src_buf && !vir->curr_buf && !list_empty(&vir->buf_queue)) {
1433
+			vir->curr_buf = list_first_entry(&vir->buf_queue,
1434
+					struct rkisp_buffer, queue);
1435
+			list_del(&vir->curr_buf->queue);
1436
+		}
1437
+		spin_unlock_irqrestore(&vir->vbq_lock, lock_flags);
1438
+
1439
+		if (!vir->curr_buf || !src_buf)
1440
+			goto end;
1441
+
1442
+		for (i = 0; i < vir->out_isp_fmt.mplanes; i++) {
1443
+			u32 payload_size = vir->out_fmt.plane_fmt[i].sizeimage;
1444
+			void *src = vb2_plane_vaddr(&src_buf->vb.vb2_buf, i);
1445
+			void *dst = vb2_plane_vaddr(&vir->curr_buf->vb.vb2_buf, i);
1446
+
1447
+			if (!src || !dst)
1448
+				break;
1449
+			vb2_set_plane_payload(&vir->curr_buf->vb.vb2_buf, i, payload_size);
1450
+			memcpy(dst, src, payload_size);
1451
+		}
1452
+
1453
+		vir->curr_buf->vb.sequence = src_buf->vb.sequence;
1454
+		vir->curr_buf->vb.vb2_buf.timestamp = src_buf->vb.vb2_buf.timestamp;
1455
+		vb2_buffer_done(&vir->curr_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
1456
+		vir->curr_buf = NULL;
1457
+end:
1458
+		if (src_buf)
1459
+			vb2_buffer_done(&src_buf->vb.vb2_buf, VB2_BUF_STATE_DONE);
1460
+		src_buf = NULL;
1461
+		spin_lock_irqsave(&vir->vbq_lock, lock_flags);
1462
+
1463
+		if (!list_empty(&cpy->queue)) {
1464
+			src_buf = list_first_entry(&cpy->queue,
1465
+					struct rkisp_buffer, queue);
1466
+			list_del(&src_buf->queue);
1467
+		} else if (vir->stopping) {
1468
+			vir->streaming = false;
1469
+		}
1470
+
1471
+		spin_unlock_irqrestore(&vir->vbq_lock, lock_flags);
1472
+	}
1473
+
1474
+	vir->frame_end = true;
1475
+
1476
+	if (vir->stopping) {
1477
+		vir->stopping = false;
1478
+		vir->streaming = false;
1479
+		wake_up(&vir->done);
1480
+	}
1481
+
1482
+	v4l2_dbg(1, rkisp_debug, &vir->ispdev->v4l2_dev,
1483
+		 "%s exit\n", __func__);
1484
+}
1485
+
13811486 
13821487 /*
13831488  * Most of registers inside rockchip isp1 have shadow register since
....@@ -1571,6 +1676,21 @@
15711676 	if (!stream->streaming)
15721677 		goto end;
15731678 
1679
+	if (stream->id == RKISP_STREAM_VIR) {
1680
+		stream->stopping = true;
1681
+		wait_event_timeout(stream->done,
1682
+				   stream->frame_end,
1683
+				   msecs_to_jiffies(500));
1684
+		stream->streaming = false;
1685
+		stream->stopping = false;
1686
+		destroy_buf_queue(stream, VB2_BUF_STATE_ERROR);
1687
+
1688
+		if (!completion_done(&dev->cap_dev.vir_cpy.cmpl))
1689
+			complete(&dev->cap_dev.vir_cpy.cmpl);
1690
+		stream->conn_id = -1;
1691
+		goto end;
1692
+	}
1693
+
15741694 	rkisp_stream_stop(stream);
15751695 	if (stream->id == RKISP_STREAM_MP ||
15761696 	    stream->id == RKISP_STREAM_SP) {
....@@ -1650,6 +1770,28 @@
16501770 	if (WARN_ON(stream->streaming)) {
16511771 		mutex_unlock(&dev->hw_dev->dev_lock);
16521772 		return -EBUSY;
1773
+	}
1774
+
1775
+	if (stream->id == RKISP_STREAM_VIR) {
1776
+		struct rkisp_stream *t = &dev->cap_dev.stream[stream->conn_id];
1777
+
1778
+		if (t->streaming) {
1779
+			INIT_WORK(&dev->cap_dev.vir_cpy.work, vir_cpy_image);
1780
+			init_completion(&dev->cap_dev.vir_cpy.cmpl);
1781
+			INIT_LIST_HEAD(&dev->cap_dev.vir_cpy.queue);
1782
+			dev->cap_dev.vir_cpy.stream = stream;
1783
+			schedule_work(&dev->cap_dev.vir_cpy.work);
1784
+			ret = 0;
1785
+		} else {
1786
+			v4l2_err(&dev->v4l2_dev,
1787
+				 "no stream enable for iqtool\n");
1788
+			destroy_buf_queue(stream, VB2_BUF_STATE_QUEUED);
1789
+			ret = -EINVAL;
1790
+		}
1791
+
1792
+		mutex_unlock(&dev->hw_dev->dev_lock);
1793
+
1794
+		return ret;
16531795 	}
16541796 
16551797 	memset(&stream->dbg, 0, sizeof(stream->dbg));
....@@ -1787,7 +1929,7 @@
17871929 
17881930 	switch (id) {
17891931 	case RKISP_STREAM_SP:
1790
-		strlcpy(vdev->name, SP_VDEV_NAME,
1932
+		strscpy(vdev->name, SP_VDEV_NAME,
17911933 			sizeof(vdev->name));
17921934 		stream->ops = &rkisp_sp_streams_ops;
17931935 		stream->config = &rkisp_sp_stream_config;
....@@ -1795,25 +1937,32 @@
17951937 		stream->config->fmt_size = ARRAY_SIZE(sp_fmts);
17961938 		break;
17971939 	case RKISP_STREAM_DMATX0:
1798
-		strlcpy(vdev->name, DMATX0_VDEV_NAME,
1940
+		strscpy(vdev->name, DMATX0_VDEV_NAME,
17991941 			sizeof(vdev->name));
18001942 		stream->ops = &rkisp2_dmatx0_streams_ops;
18011943 		stream->config = &rkisp2_dmatx0_stream_config;
18021944 		break;
18031945 	case RKISP_STREAM_DMATX2:
1804
-		strlcpy(vdev->name, DMATX2_VDEV_NAME,
1946
+		strscpy(vdev->name, DMATX2_VDEV_NAME,
18051947 			sizeof(vdev->name));
18061948 		stream->ops = &rkisp2_dmatx2_streams_ops;
18071949 		stream->config = &rkisp2_dmatx1_stream_config;
18081950 		break;
18091951 	case RKISP_STREAM_DMATX3:
1810
-		strlcpy(vdev->name, DMATX3_VDEV_NAME,
1952
+		strscpy(vdev->name, DMATX3_VDEV_NAME,
18111953 			sizeof(vdev->name));
18121954 		stream->ops = &rkisp2_dmatx3_streams_ops;
18131955 		stream->config = &rkisp2_dmatx3_stream_config;
18141956 		break;
1957
+	case RKISP_STREAM_VIR:
1958
+		strscpy(vdev->name, VIR_VDEV_NAME,
1959
+			sizeof(vdev->name));
1960
+		stream->ops = NULL;
1961
+		stream->config = &rkisp_mp_stream_config;
1962
+		stream->conn_id = -1;
1963
+		break;
18151964 	default:
1816
-		strlcpy(vdev->name, MP_VDEV_NAME,
1965
+		strscpy(vdev->name, MP_VDEV_NAME,
18171966 			sizeof(vdev->name));
18181967 		stream->ops = &rkisp_mp_streams_ops;
18191968 		stream->config = &rkisp_mp_stream_config;
....@@ -1857,8 +2006,13 @@
18572006 	ret = rkisp_stream_init(dev, RKISP_STREAM_DMATX3);
18582007 	if (ret < 0)
18592008 		goto err_free_tx2;
2009
+	ret = rkisp_stream_init(dev, RKISP_STREAM_VIR);
2010
+	if (ret < 0)
2011
+		goto err_free_tx3;
18602012 
18612013 	return 0;
2014
+err_free_tx3:
2015
+	rkisp_unregister_stream_vdev(&cap_dev->stream[RKISP_STREAM_DMATX3]);
18622016 err_free_tx2:
18632017 	rkisp_unregister_stream_vdev(&cap_dev->stream[RKISP_STREAM_DMATX2]);
18642018 err_free_tx0:
....@@ -1886,6 +2040,8 @@
18862040 	rkisp_unregister_stream_vdev(stream);
18872041 	stream = &cap_dev->stream[RKISP_STREAM_DMATX3];
18882042 	rkisp_unregister_stream_vdev(stream);
2043
+	stream = &cap_dev->stream[RKISP_STREAM_VIR];
2044
+	rkisp_unregister_stream_vdev(stream);
18892045 }
18902046 
18912047 /****************  Interrupter Handler ****************/
....@@ -1905,7 +2061,7 @@
19052061 	for (i = 0; i < RKISP_MAX_STREAM; ++i) {
19062062 		stream = &dev->cap_dev.stream[i];
19072063 
1908
-		if (!(mis_val & CIF_MI_FRAME(stream)))
2064
+		if (!(mis_val & CIF_MI_FRAME(stream)) || stream->id == RKISP_STREAM_VIR)
19092065 			continue;
19102066 
19112067 		if (i == RKISP_STREAM_DMATX0)