Hi Tomasz,
On Mon, Jan 23, 2012 at 05:51, Tomasz Stanislawski t.stanislaws@samsung.com wrote:
From: Marek Szyprowski m.szyprowski@samsung.com
Signed-off-by: Marek Szyprowski m.szyprowski@samsung.com
drivers/media/video/videobuf2-core.c | 11 +++++++++++ include/media/videobuf2-core.h | 2 ++ 2 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index 4c3a82e..cb85874 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -836,6 +836,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) { struct vb2_queue *q = vb->vb2_queue; unsigned long flags;
- int plane;
if (vb->state != VB2_BUF_STATE_ACTIVE) return; @@ -846,6 +847,10 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) dprintk(4, "Done processing on buffer %d, state: %d\n", vb->v4l2_buf.index, vb->state);
- /* sync buffers */
- for (plane = 0; plane < vb->num_planes; ++plane)
- call_memop(q, finish, vb->planes[plane].mem_priv);
/* Add the buffer to the done buffers list */ spin_lock_irqsave(&q->done_lock, flags); vb->state = state; @@ -1136,9 +1141,15 @@ err: static void __enqueue_in_driver(struct vb2_buffer *vb) { struct vb2_queue *q = vb->vb2_queue;
- int plane;
vb->state = VB2_BUF_STATE_ACTIVE; atomic_inc(&q->queued_count);
- /* sync buffers */
- for (plane = 0; plane < vb->num_planes; ++plane)
- call_memop(q, prepare, vb->planes[plane].mem_priv);
q->ops->buf_queue(vb); }
diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index 35607f7..d8b8171 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -76,6 +76,8 @@ struct vb2_fileio_data; */ struct vb2_mem_ops { void *(*alloc)(void *alloc_ctx, unsigned long size);
- void (*prepare)(void *buf_priv);
- void (*finish)(void *buf_priv);
void (*put)(void *buf_priv);
void *(*get_userptr)(void *alloc_ctx, unsigned long vaddr,
1.7.5.4
Those callbacks need to be documented in struct vb2_mem_ops documentation in code. Apart from that the patch looks good.