Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

media: coda: add coda_wake_up_capture_queue 



Combine setting the last_buffer_dequeued flag on the capture video
queue and waking up its done workqueue into a helper function.

Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+samsung@kernel.org>
parent f3775f89

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

+13 −7
Original line number Diff line number Diff line
@@ -1004,11 +1004,21 @@ static int coda_try_encoder_cmd(struct file *file, void *fh, 
	return v4l2_m2m_ioctl_try_encoder_cmd(file, fh, ec);

}



static void coda_wake_up_capture_queue(struct coda_ctx *ctx)

{

	struct vb2_queue *dst_vq;



	coda_dbg(1, ctx, "waking up capture queue\n");



	dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx, V4L2_BUF_TYPE_VIDEO_CAPTURE);

	dst_vq->last_buffer_dequeued = true;

	wake_up(&dst_vq->done_wq);

}



static int coda_encoder_cmd(struct file *file, void *fh,

			    struct v4l2_encoder_cmd *ec)

{

	struct coda_ctx *ctx = fh_to_ctx(fh);

	struct vb2_queue *dst_vq;

	int ret;



	ret = coda_try_encoder_cmd(file, fh, ec);
@@ -1021,12 +1031,8 @@ static int coda_encoder_cmd(struct file *file, void *fh, 
	flush_work(&ctx->pic_run_work);



	/* If there is no buffer in flight, wake up */

	if (!ctx->streamon_out || ctx->qsequence == ctx->osequence) {

		dst_vq = v4l2_m2m_get_vq(ctx->fh.m2m_ctx,

					 V4L2_BUF_TYPE_VIDEO_CAPTURE);

		dst_vq->last_buffer_dequeued = true;

		wake_up(&dst_vq->done_wq);

	}

	if (!ctx->streamon_out || ctx->qsequence == ctx->osequence)

		coda_wake_up_capture_queue(ctx);



	return 0;

}