Acked-by: Pawel Osciak <pawel@xxxxxxxxxx> Thanks Michael! Pawel On Tue, Jul 12, 2011 at 06:46, Michael Olbrich <m.olbrich@xxxxxxxxxxxxxx> wrote: > These are necessary to prevent dead-locks e.g. if one thread waits > in dqbuf at one end and another tries to queue a buffer at the > other end. > > Signed-off-by: Michael Olbrich <m.olbrich@xxxxxxxxxxxxxx> > Cc: Mauro Carvalho Chehab <mchehab@xxxxxxxxxxxxx> > Cc: Pawel Osciak <pawel@xxxxxxxxxx> > --- > drivers/media/video/mem2mem_testdev.c | 14 ++++++++++++++ > 1 files changed, 14 insertions(+), 0 deletions(-) > > diff --git a/drivers/media/video/mem2mem_testdev.c b/drivers/media/video/mem2mem_testdev.c > index b03d74e..effefa0 100644 > --- a/drivers/media/video/mem2mem_testdev.c > +++ b/drivers/media/video/mem2mem_testdev.c > @@ -795,10 +795,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) > -- > 1.7.5.4 > > -- Best regards, Pawel Osciak -- To unsubscribe from this list: send the line "unsubscribe linux-media" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html