From c02d0438afd937ae78aa670fbaf6a0ae00ac759b Mon Sep 17 00:00:00 2001 From: Michael Olbrich Date: Tue, 12 Jul 2011 09:46:44 -0300 Subject: [PATCH] --- yaml --- r: 271927 b: refs/heads/master c: 0f910bf0008c54b33da5691278c8ee8e8700ac48 h: refs/heads/master i: 271925: 1d066742a35f90853ef3d0a65683883f8f063691 271923: c762f5db38cd8071320298bebc6a755c806b7327 271919: 0302def121e78bb998203bf8a88f6f9881d10743 v: v3 --- [refs] | 2 +- trunk/drivers/media/video/mem2mem_testdev.c | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index b30396f5dbff..337bf8a2b9e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0689133b7fadd2e10f4bddca36c895223a541c6c +refs/heads/master: 0f910bf0008c54b33da5691278c8ee8e8700ac48 diff --git a/trunk/drivers/media/video/mem2mem_testdev.c b/trunk/drivers/media/video/mem2mem_testdev.c index 0d0c0d5ac3a4..9594b52f8605 100644 --- a/trunk/drivers/media/video/mem2mem_testdev.c +++ b/trunk/drivers/media/video/mem2mem_testdev.c @@ -793,10 +793,24 @@ static void m2mtest_buf_queue(struct vb2_buffer *vb) v4l2_m2m_buf_queue(ctx->m2m_ctx, vb); } +static void m2mtest_wait_prepare(struct vb2_queue *q) +{ + struct m2mtest_ctx *ctx = vb2_get_drv_priv(q); + m2mtest_unlock(ctx); +} + +static void m2mtest_wait_finish(struct vb2_queue *q) +{ + struct m2mtest_ctx *ctx = vb2_get_drv_priv(q); + m2mtest_lock(ctx); +} + static struct vb2_ops m2mtest_qops = { .queue_setup = m2mtest_queue_setup, .buf_prepare = m2mtest_buf_prepare, .buf_queue = m2mtest_buf_queue, + .wait_prepare = m2mtest_wait_prepare, + .wait_finish = m2mtest_wait_finish, }; static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)