media: coda: fix unset field and fail on invalid field in buf_prepare (583958cb) · Commits · 戴 / test

v4l2-compliance likes to queue a buffer with field set to V4L2_FIELD_ANY and expects it to be returned corrected to a valid field. Follow vicodec in handling this in the buf_prepare callback. Signed-off-by:

Philipp Zabel <p.zabel@pengutronix.de> Signed-off-by:

Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by:

Mauro Carvalho Chehab <mchehab+samsung@kernel.org>

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

+10 −0

Original line number	Diff line number	Diff line
		@@ -1515,10 +1515,20 @@ static int coda_queue_setup(struct vb2_queue *vq,

		static int coda_buf_prepare(struct vb2_buffer *vb)
		{
		struct vb2_v4l2_buffer *vbuf = to_vb2_v4l2_buffer(vb);
		struct coda_ctx *ctx = vb2_get_drv_priv(vb->vb2_queue);
		struct coda_q_data *q_data;

		q_data = get_q_data(ctx, vb->vb2_queue->type);
		if (V4L2_TYPE_IS_OUTPUT(vb->vb2_queue->type)) {
		if (vbuf->field == V4L2_FIELD_ANY)
		vbuf->field = V4L2_FIELD_NONE;
		if (vbuf->field != V4L2_FIELD_NONE) {
		v4l2_warn(&ctx->dev->v4l2_dev,
		"%s field isn't supported\n", __func__);
		return -EINVAL;
		}
		}

		if (vb2_plane_size(vb, 0) < q_data->sizeimage) {
		v4l2_warn(&ctx->dev->v4l2_dev,

Admin message