openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[media] v4l: mem2mem: add wait_{prepare,finish} ops to m2m_testdev 

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@pengutronix.de>
Cc: Mauro Carvalho Chehab <mchehab@infradead.org>
Cc: Pawel Osciak <pawel@osciak.com>
Acked-by: Pawel Osciak <pawel@osciak.com>
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
This commit is contained in:
Michael Olbrich 2011-07-12 09:46:44 -03:00 committed by Mauro Carvalho Chehab
parent 0689133b7f
commit 0f910bf000
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/media/video/mem2mem_testdev.c
View File

@ -793,10 +793,24 @@ static void m2mtest_buf_queue(struct vb2_buffer *vb)
v4l2_m2m_buf_queue(ctx->m2m_ctx, 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 = { static struct vb2_ops m2mtest_qops = {
.queue_setup = m2mtest_queue_setup, .queue_setup = m2mtest_queue_setup,
.buf_prepare = m2mtest_buf_prepare, .buf_prepare = m2mtest_buf_prepare,
.buf_queue = m2mtest_buf_queue, .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) static int queue_init(void *priv, struct vb2_queue *src_vq, struct vb2_queue *dst_vq)