From b983df193ebc6ba597ba9e927ade1ff3558ddd20 Mon Sep 17 00:00:00 2001
From: Cai YiWei <cyw@rock-chips.com>
Date: Thu, 19 Nov 2020 11:39:42 +0800
Subject: [PATCH] media: rockchip: isp: fix frame id error for isp21

Change-Id: I072e94b868c77e966dca0f31ce2653b672d63053
Signed-off-by: Cai YiWei <cyw@rock-chips.com>
---
 .../media/platform/rockchip/isp/capture_v21.c | 25 +++++++++----------
 drivers/media/platform/rockchip/isp/dev.c     |  4 +--
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/drivers/media/platform/rockchip/isp/capture_v21.c b/drivers/media/platform/rockchip/isp/capture_v21.c
index aa1fee021f7a..405aeaac57ff 100644
--- a/drivers/media/platform/rockchip/isp/capture_v21.c
+++ b/drivers/media/platform/rockchip/isp/capture_v21.c
@@ -728,13 +728,14 @@ static int mi_frame_end(struct rkisp_stream *stream)
 			vb2_set_plane_payload(vb2_buf, i, payload_size);
 		}
 		if (stream->id == RKISP_STREAM_MP ||
-		    stream->id == RKISP_STREAM_SP)
-			rkisp_dmarx_get_frame(dev,
-					      &stream->curr_buf->vb.sequence,
-					      &ns, false);
-		else
+		    stream->id == RKISP_STREAM_SP) {
+			rkisp_dmarx_get_frame(dev, &i, &ns, true);
+			atomic_set(&stream->sequence, i);
+			stream->curr_buf->vb.sequence = i;
+		} else {
 			stream->curr_buf->vb.sequence =
 				atomic_read(&stream->sequence) - 1;
+		}
 		if (!ns)
 			ns = ktime_get_ns();
 		vb2_buf->timestamp = ns;
@@ -1474,7 +1475,7 @@ void rkisp_mipi_v21_isr(unsigned int phy, unsigned int packet,
 {
 	struct v4l2_device *v4l2_dev = &dev->v4l2_dev;
 	struct rkisp_stream *stream;
-	int i;
+	int i, id;
 
 	v4l2_dbg(3, rkisp_debug, &dev->v4l2_dev,
 		 "csi state:0x%x\n", state);
@@ -1495,11 +1496,10 @@ void rkisp_mipi_v21_isr(unsigned int phy, unsigned int packet,
 			if (!((RAW0_Y_STATE << i) & state) ||
 			    dev->csi_dev.tx_first[i])
 				continue;
-			if (i)
-				i++;
 			dev->csi_dev.tx_first[i] = true;
-			rkisp_csi_sof(dev, i);
-			stream = &dev->cap_dev.stream[i + RKISP_STREAM_DMATX0];
+			id = i ? 2 : 0;
+			rkisp_csi_sof(dev, id);
+			stream = &dev->cap_dev.stream[id + RKISP_STREAM_DMATX0];
 			atomic_inc(&stream->sequence);
 		}
 	}
@@ -1507,10 +1507,9 @@ void rkisp_mipi_v21_isr(unsigned int phy, unsigned int packet,
 		for (i = 0; i < HDR_DMA_MAX - 1; i++) {
 			if (!((RAW0_WR_FRAME << i) & state))
 				continue;
-			if (i)
-				i++;
 			if (!dev->csi_dev.tx_first[i]) {
-				stream = &dev->cap_dev.stream[i + RKISP_STREAM_DMATX0];
+				id = i ? RKISP_STREAM_DMATX2 : RKISP_STREAM_DMATX0;
+				stream = &dev->cap_dev.stream[id];
 				atomic_inc(&stream->sequence);
 			}
 			dev->csi_dev.tx_first[i] = false;
diff --git a/drivers/media/platform/rockchip/isp/dev.c b/drivers/media/platform/rockchip/isp/dev.c
index 6a5e71fa5f24..3b12d5e50fd4 100644
--- a/drivers/media/platform/rockchip/isp/dev.c
+++ b/drivers/media/platform/rockchip/isp/dev.c
@@ -390,10 +390,10 @@ static int _set_pipeline_default_fmt(struct rkisp_device *dev)
 
 	/* change fmt&size of MP/SP */
 	rkisp_set_stream_def_fmt(dev, RKISP_STREAM_MP,
-				 width, height, V4L2_PIX_FMT_YUYV);
+				 width, height, V4L2_PIX_FMT_NV12);
 	if (dev->isp_ver != ISP_V10_1)
 		rkisp_set_stream_def_fmt(dev, RKISP_STREAM_SP,
-					 width, height, V4L2_PIX_FMT_YUYV);
+					 width, height, V4L2_PIX_FMT_NV12);
 	if ((dev->isp_ver == ISP_V20 || dev->isp_ver == ISP_V21) &&
 	    dev->active_sensor->mbus.type == V4L2_MBUS_CSI2) {
 		width = dev->active_sensor->fmt[1].format.width;