Commit 331e7860 authored by Philipp Zabel's avatar Philipp Zabel Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 888708b1

drivers/media/platform/coda/coda-bit.c

+22 −6
Original line number Diff line number Diff line
@@ -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);

			}



			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 &&

drivers/media/platform/coda/coda-common.c

+22 −7
Original line number Diff line number Diff line
@@ -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 {

drivers/media/platform/coda/coda.h

+1 −1
Original line number Diff line number Diff line
@@ -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);

CRA Git | Maintained and supported by SUSTech CRA and CCSE