From 126a959455119df375a69878347d8319dbca6b1c Mon Sep 17 00:00:00 2001 From: Cai YiWei Date: Thu, 1 Apr 2021 09:21:10 +0800 Subject: [PATCH] media: rockchip: isp: capture buf queue add to list tail Change-Id: I21e030408ca936bd6f567536a6c12c9be3caebf5 Signed-off-by: Cai YiWei --- drivers/media/platform/rockchip/isp/capture_v1x.c | 12 +----------- drivers/media/platform/rockchip/isp/capture_v20.c | 15 +-------------- 2 files changed, 2 insertions(+), 25 deletions(-) diff --git a/drivers/media/platform/rockchip/isp/capture_v1x.c b/drivers/media/platform/rockchip/isp/capture_v1x.c index 410cc0911d06..98e1695ee793 100644 --- a/drivers/media/platform/rockchip/isp/capture_v1x.c +++ b/drivers/media/platform/rockchip/isp/capture_v1x.c @@ -634,17 +634,7 @@ static void rkisp_buf_queue(struct vb2_buffer *vb) stream->id, ispbuf->buff_addr[0]); spin_lock_irqsave(&stream->vbq_lock, lock_flags); - - /* XXX: replace dummy to speed up */ - if (stream->streaming && - !stream->next_buf && - !stream->interlaced && - atomic_read(&stream->ispdev->isp_sdev.frm_sync_seq) == 0) { - stream->next_buf = ispbuf; - stream->ops->update_mi(stream); - } else { - list_add_tail(&ispbuf->queue, &stream->buf_queue); - } + list_add_tail(&ispbuf->queue, &stream->buf_queue); spin_unlock_irqrestore(&stream->vbq_lock, lock_flags); } diff --git a/drivers/media/platform/rockchip/isp/capture_v20.c b/drivers/media/platform/rockchip/isp/capture_v20.c index 97a08a707306..f7fd6b830455 100644 --- a/drivers/media/platform/rockchip/isp/capture_v20.c +++ b/drivers/media/platform/rockchip/isp/capture_v20.c @@ -2107,20 +2107,7 @@ void rkisp_spbuf_queue(struct rkisp_stream *stream, struct rkisp_buffer *sp_buf) unsigned long lock_flags = 0; spin_lock_irqsave(&stream->vbq_lock, lock_flags); - /* XXX: replace dummy to speed up */ - if (stream->streaming && - !stream->next_buf && - !stream->interlaced && - stream->id != RKISP_STREAM_DMATX0 && - stream->id != RKISP_STREAM_DMATX1 && - stream->id != RKISP_STREAM_DMATX2 && - stream->id != RKISP_STREAM_DMATX3 && - atomic_read(&stream->ispdev->isp_sdev.frm_sync_seq) == 0) { - stream->next_buf = sp_buf; - stream->ops->update_mi(stream); - } else { - list_add_tail(&sp_buf->queue, &stream->buf_queue); - } + list_add_tail(&sp_buf->queue, &stream->buf_queue); spin_unlock_irqrestore(&stream->vbq_lock, lock_flags); }