media: coda: add coda_wake_up_capture_queue
authorPhilipp Zabel <p.zabel@pengutronix.de>
Tue, 18 Jun 2019 16:45:12 +0000 (12:45 -0400)
committerMauro Carvalho Chehab <mchehab+samsung@kernel.org>
Mon, 24 Jun 2019 18:21:39 +0000 (14:21 -0400)
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: 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

index b9ddf0cfdb8330711a37e5e926fcbbc3623ffbaf..095747ae1c40e194fcd80f865bb41a09621181e9 100644 (file)
@@ -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;
 }