From fd32f0f8d606194eda49d73aa0575f152c7d8994 Mon Sep 17 00:00:00 2001 From: Zefa Chen Date: Mon, 20 Mar 2023 18:40:13 +0800 Subject: [PATCH] media: rockchip: vicap: scale video capture follow main stream Signed-off-by: Zefa Chen Change-Id: Ie1d052bae55027d42d8ecb5976c9dccddd1e784c --- drivers/media/platform/rockchip/cif/cif-scale.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/media/platform/rockchip/cif/cif-scale.c b/drivers/media/platform/rockchip/cif/cif-scale.c index fe785dcd119d..7aaeb23fdaeb 100644 --- a/drivers/media/platform/rockchip/cif/cif-scale.c +++ b/drivers/media/platform/rockchip/cif/cif-scale.c @@ -555,7 +555,6 @@ static int rkcif_scale_stop(struct rkcif_scale_vdev *scale_vdev) static void rkcif_scale_vb2_stop_streaming(struct vb2_queue *vq) { struct rkcif_scale_vdev *scale_vdev = vq->drv_priv; - struct rkcif_stream *stream = scale_vdev->stream; struct rkcif_device *dev = scale_vdev->cifdev; struct rkcif_buffer *buf = NULL; int ret = 0; @@ -586,7 +585,6 @@ static void rkcif_scale_vb2_stop_streaming(struct vb2_queue *vq) vb2_buffer_done(&buf->vb.vb2_buf, VB2_BUF_STATE_ERROR); } mutex_unlock(&dev->scale_lock); - rkcif_do_stop_stream(stream, RKCIF_STREAM_MODE_TOSCALE); } static int rkcif_scale_channel_init(struct rkcif_scale_vdev *scale_vdev) @@ -887,7 +885,6 @@ rkcif_scale_vb2_start_streaming(struct vb2_queue *queue, return ret; } - rkcif_do_start_stream(stream, RKCIF_STREAM_MODE_TOSCALE); return 0; } @@ -994,13 +991,13 @@ static void rkcif_scale_update_stream(struct rkcif_scale_vdev *scale_vdev, int c RKCIF_YUV_ADDR_STATE_UPDATE, ch); + scale_vdev->frame_idx = scale_vdev->stream->frame_idx; if (active_buf && (!ret)) { vb_done = &active_buf->vb; vb_done->vb2_buf.timestamp = ktime_get_ns(); vb_done->sequence = scale_vdev->frame_idx; rkcif_scale_vb_done_oneframe(scale_vdev, vb_done); } - scale_vdev->frame_idx++; } void rkcif_irq_handle_scale(struct rkcif_device *cif_dev, unsigned int intstat_glb)