[media] coda: keep queued buffers on a temporary list during start_streaming

Keeping buffers filled into the bitstream on a temporary list instead of
immediately calling vb2_buffer_done on each of them immediately allows
start_streaming to correctly decide whether they should be marked as
done or requeued if an error occurs after the bitstream has been filled.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>

diff --git a/drivers/media/platform/coda/coda-bit.c b/drivers/media/platform/coda/coda-bit.c
index 466a44e4549e5e611d13a5b3d08f91571524301d..e3e32256078367e72b6e467f83e0dcbb65ca8c09 100644 (file)
--- a/drivers/media/platform/coda/coda-bit.c
+++ b/drivers/media/platform/coda/coda-bit.c
@@ -224,7 +224,7 @@ static bool coda_bitstream_try_queue(struct coda_ctx *ctx,
        return true;
 }
 
-void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
+void coda_fill_bitstream(struct coda_ctx *ctx, struct list_head *buffer_list)
 {
        struct vb2_v4l2_buffer *src_buf;
        struct coda_buffer_meta *meta;
@@ -252,9 +252,16 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
                                 "dropping invalid JPEG frame %d\n",
                                 ctx->qsequence);
                        src_buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx);
-                       v4l2_m2m_buf_done(src_buf, streaming ?
-                                         VB2_BUF_STATE_ERROR :
-                                         VB2_BUF_STATE_QUEUED);
+                       if (buffer_list) {
+                               struct v4l2_m2m_buffer *m2m_buf;
+
+                               m2m_buf = container_of(src_buf,
+                                                      struct v4l2_m2m_buffer,
+                                                      vb);
+                               list_add_tail(&m2m_buf->list, buffer_list);
+                       } else {
+                               v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_ERROR);
+                       }
                        continue;
                }
 
@@ -295,7 +302,16 @@ void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming)
                                trace_coda_bit_queue(ctx, src_buf, meta);
                        }
 
-                       v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
+                       if (buffer_list) {
+                               struct v4l2_m2m_buffer *m2m_buf;
+
+                               m2m_buf = container_of(src_buf,
+                                                      struct v4l2_m2m_buffer,
+                                                      vb);
+                               list_add_tail(&m2m_buf->list, buffer_list);
+                       } else {
+                               v4l2_m2m_buf_done(src_buf, VB2_BUF_STATE_DONE);
+                       }
                } else {
                        break;
                }
@@ -1747,7 +1763,7 @@ static int coda_prepare_decode(struct coda_ctx *ctx)
 
        /* Try to copy source buffer contents into the bitstream ringbuffer */
        mutex_lock(&ctx->bitstream_mutex);
-       coda_fill_bitstream(ctx, true);
+       coda_fill_bitstream(ctx, NULL);
        mutex_unlock(&ctx->bitstream_mutex);
 
        if (coda_get_bitstream_payload(ctx) < 512 &&

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index ee9d4b81d6752cd49ff9195e1636407a5e0e9a7a..1df4aa29ec28650b5f003abb48eb74fa71c651a9 100644 (file)
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -1378,7 +1378,7 @@ static void coda_buf_queue(struct vb2_buffer *vb)
                v4l2_m2m_buf_queue(ctx->fh.m2m_ctx, vbuf);
                if (vb2_is_streaming(vb->vb2_queue))
                        /* This set buf->sequence = ctx->qsequence++ */
-                       coda_fill_bitstream(ctx, true);
+                       coda_fill_bitstream(ctx, NULL);
                mutex_unlock(&ctx->bitstream_mutex);
        } else {
                if (ctx->inst_type == CODA_INST_ENCODER &&
@@ -1433,18 +1433,22 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
        struct coda_ctx *ctx = vb2_get_drv_priv(q);
        struct v4l2_device *v4l2_dev = &ctx->dev->v4l2_dev;
        struct coda_q_data *q_data_src, *q_data_dst;
+       struct v4l2_m2m_buffer *m2m_buf, *tmp;
        struct vb2_v4l2_buffer *buf;
+       struct list_head list;
        int ret = 0;
 
        if (count < 1)
                return -EINVAL;
 
+       INIT_LIST_HEAD(&list);
+
        q_data_src = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_OUTPUT);
        if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
                if (ctx->inst_type == CODA_INST_DECODER && ctx->use_bit) {
                        /* copy the buffers that were queued before streamon */
                        mutex_lock(&ctx->bitstream_mutex);
-                       coda_fill_bitstream(ctx, false);
+                       coda_fill_bitstream(ctx, &list);
                        mutex_unlock(&ctx->bitstream_mutex);
 
                        if (coda_get_bitstream_payload(ctx) < 512) {
@@ -1460,7 +1464,7 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
 
        /* Don't start the coda unless both queues are on */
        if (!(ctx->streamon_out && ctx->streamon_cap))
-               return 0;
+               goto out;
 
        q_data_dst = get_q_data(ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);
        if ((q_data_src->width != q_data_dst->width &&
@@ -1495,15 +1499,26 @@ static int coda_start_streaming(struct vb2_queue *q, unsigned int count)
        ret = ctx->ops->start_streaming(ctx);
        if (ctx->inst_type == CODA_INST_DECODER) {
                if (ret == -EAGAIN)
-                       return 0;
-               else if (ret < 0)
-                       goto err;
+                       goto out;
        }
+       if (ret < 0)
+               goto err;
 
-       return ret;
+out:
+       if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               list_for_each_entry_safe(m2m_buf, tmp, &list, list) {
+                       list_del(&m2m_buf->list);
+                       v4l2_m2m_buf_done(&m2m_buf->vb, VB2_BUF_STATE_DONE);
+               }
+       }
+       return 0;
 
 err:
        if (q->type == V4L2_BUF_TYPE_VIDEO_OUTPUT) {
+               list_for_each_entry_safe(m2m_buf, tmp, &list, list) {
+                       list_del(&m2m_buf->list);
+                       v4l2_m2m_buf_done(&m2m_buf->vb, VB2_BUF_STATE_QUEUED);
+               }
                while ((buf = v4l2_m2m_src_buf_remove(ctx->fh.m2m_ctx)))
                        v4l2_m2m_buf_done(buf, VB2_BUF_STATE_QUEUED);
        } else {

diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h
index 4b831c91ae4aff81f59574811f67ae82f1508eee..6aa9c19c4a896fa973cad4c3dc33c7878582d176 100644 (file)
--- a/drivers/media/platform/coda/coda.h
+++ b/drivers/media/platform/coda/coda.h
@@ -259,7 +259,7 @@ int coda_decoder_queue_init(void *priv, struct vb2_queue *src_vq,
 
 int coda_hw_reset(struct coda_ctx *ctx);
 
-void coda_fill_bitstream(struct coda_ctx *ctx, bool streaming);
+void coda_fill_bitstream(struct coda_ctx *ctx, struct list_head *buffer_list);
 
 void coda_set_gdi_regs(struct coda_ctx *ctx);