<div style="font-family: arial, helvetica, sans-serif">ping? <div class="gmail_quote">On Tue, Jun 19, 2012 at 11:12 PM, Dima Zavin <<a href="mailto:dmitriyz@google.com" target="_blank">dmitriyz@google.com</a>> wrote: <blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Tomasz, I've encountered an issue with this patch when userspace does several stream_on/stream_off cycles. When the user tries to qbuf a buffer after doing stream_off, we trigger the "dmabuf already pinned" warning since we didn't unmap the buffer as dqbuf was never called. The below patch adds calls to unmap in queue_cancel, but my feeling is that we probably should be calling detach too (i.e. put_dmabuf). Thoughts? --Dima Subject: [PATCH] v4l: vb2: unmap dmabufs on STREAM_OFF event Currently, if the user issues a STREAM_OFF request and then tries to re-enqueue buffers, it will trigger a warning in the vb2 allocators as the buffer would still be mapped from before STREAM_OFF was called. The current expectation is that buffers will be unmapped in dqbuf, but that will never be called on the mapped buffers after a STREAM_OFF event. Cc: Sumit Semwal <<a href="mailto:sumit.semwal@ti.com">sumit.semwal@ti.com</a>> Cc: Tomasz Stanislawski <<a href="mailto:t.stanislaws@samsung.com">t.stanislaws@samsung.com</a>> Signed-off-by: Dima Zavin <<a href="mailto:dima@android.com">dima@android.com</a>> --- drivers/media/video/videobuf2-core.c | 22 ++++++++++++++++++++-- 1 files changed, 20 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index b431dc6..e2a8f12 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -1592,8 +1592,26 @@ static void __vb2_queue_cancel(struct vb2_queue *q) /* * Reinitialize all buffers for next use. */ - for (i = 0; i < q->num_buffers; ++i) - q->bufs[i]->state = VB2_BUF_STATE_DEQUEUED; + for (i = 0; i < q->num_buffers; ++i) { + struct vb2_buffer *vb = q->bufs[i]; + int plane; + + vb->state = VB2_BUF_STATE_DEQUEUED; + + if (q->memory != V4L2_MEMORY_DMABUF) + continue; <div class="im">+ + for (plane = 0; plane < vb->num_planes; ++plane) { </div>+ struct vb2_plane *p = &vb->planes[plane]; <div class="im">+ + if (!p->mem_priv) </div>+ continue; <div class="im">+ if (p->dbuf_mapped) { + call_memop(q, unmap_dmabuf, p->mem_priv); </div>+ p->dbuf_mapped = 0; + } + } + } } /** -- 1.7.7.3 </blockquote></div> </div>