Streaming I/O (DMA buffer importing)

Asynchronous I/O @@ -673,6 +829,14 @@ memory, set by the application. See for details. v4l2_buffer structure. + + int + fd + For the single-plane API and when +memory is V4L2_MEMORY_DMABUF this +is the file descriptor associated with a DMABUF buffer. + + __u32 length @@ -748,6 +912,15 @@ should set this to 0. + + int + fd + When the memory type in the containing &v4l2-buffer; is + V4L2_MEMORY_DMABUF, this is a file + descriptor associated with a DMABUF buffer, similar to the + fd field in &v4l2-buffer;. + + __u32 data_offset @@ -982,6 +1155,12 @@ pointer I/O. 3 [to do] + + V4L2_MEMORY_DMABUF + 2 + The buffer is used for DMA shared +buffer I/O. + diff --git a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml index 765549f..fee66ac 100644 --- a/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml +++ b/Documentation/DocBook/media/v4l/vidioc-create-bufs.xml @@ -104,6 +104,7 @@ information. memory Applications set this field to V4L2_MEMORY_MMAP or +V4L2_MEMORY_DMABUF or V4L2_MEMORY_USERPTR. See diff --git a/Documentation/DocBook/media/v4l/vidioc-qbuf.xml b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml index 9caa49a..cb5f5ff 100644 --- a/Documentation/DocBook/media/v4l/vidioc-qbuf.xml +++ b/Documentation/DocBook/media/v4l/vidioc-qbuf.xml @@ -112,6 +112,21 @@ they cannot be swapped out to disk. Buffers remain locked until dequeued, until the &VIDIOC-STREAMOFF; or &VIDIOC-REQBUFS; ioctl is called, or until the device is closed. + To enqueue a DMABUF buffer applications +set the memory field to +V4L2_MEMORY_DMABUF and the m.fd +to a file descriptor associated with a DMABUF buffer. When the multi-planar API is +used and m.fd of the passed array of &v4l2-plane; +have to be used instead. When VIDIOC_QBUF is called with a +pointer to this structure the driver sets the +V4L2_BUF_FLAG_QUEUED flag and clears the +V4L2_BUF_FLAG_MAPPED and +V4L2_BUF_FLAG_DONE flags in the +flags field, or it returns an error code. This +ioctl locks the buffer. Buffers remain locked until dequeued, +until the &VIDIOC-STREAMOFF; or &VIDIOC-REQBUFS; ioctl is called, or until the +device is closed. + Applications call the VIDIOC_DQBUF ioctl to dequeue a filled (capturing) or displayed (output) buffer from the driver's outgoing queue. They just set the diff --git a/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml b/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml index d7c9505..13381ea 100644 --- a/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml +++ b/Documentation/DocBook/media/v4l/vidioc-reqbufs.xml @@ -48,28 +48,30 @@ Description - This ioctl is used to initiate memory -mapped or user pointer -I/O. Memory mapped buffers are located in device memory and must be -allocated with this ioctl before they can be mapped into the -application's address space. User buffers are allocated by -applications themselves, and this ioctl is merely used to switch the -driver into user pointer I/O mode and to setup some internal structures. +This ioctl is used to initiate memory mapped, +user pointer or DMABUF based I/O. Memory mapped buffers are located in +device memory and must be allocated with this ioctl before they can be mapped +into the application's address space. User buffers are allocated by +applications themselves, and this ioctl is merely used to switch the driver +into user pointer I/O mode and to setup some internal structures. +Similarly, DMABUF buffers are allocated by applications through a device +driver, and this ioctl only configures the driver into DMABUF I/O mode without +performing any direct allocation. - To allocate device buffers applications initialize all -fields of the v4l2_requestbuffers structure. -They set the type field to the respective -stream or buffer type, the count field to -the desired number of buffers, memory -must be set to the requested I/O method and the reserved array -must be zeroed. When the ioctl -is called with a pointer to this structure the driver will attempt to allocate -the requested number of buffers and it stores the actual number -allocated in the count field. It can be -smaller than the number requested, even zero, when the driver runs out -of free memory. A larger number is also possible when the driver requires -more buffers to function correctly. For example video output requires at least two buffers, -one displayed and one filled by the application. + To allocate device buffers applications initialize all fields of the +v4l2_requestbuffers structure. They set the +type field to the respective stream or buffer type, +the count field to the desired number of buffers, +memory must be set to the requested I/O method and +the reserved array must be zeroed. When the ioctl is +called with a pointer to this structure the driver will attempt to allocate the +requested number of buffers and it stores the actual number allocated in the +count field. It can be smaller than the number +requested, even zero, when the driver runs out of free memory. A larger number +is also possible when the driver requires more buffers to function correctly. +For example video output requires at least two buffers, one displayed and one +filled by the application. When the I/O method is not supported the ioctl returns an &EINVAL;. @@ -103,6 +105,7 @@ as the &v4l2-format; type field. See memory Applications set this field to V4L2_MEMORY_MMAP or +V4L2_MEMORY_DMABUF or V4L2_MEMORY_USERPTR. See . -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:17 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:17 +0200 Subject: [Linaro-mm-sig] [PATCHv6 03/13] v4l: vb2: add support for shared buffer (dma_buf) In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-4-git-send-email-t.stanislaws@samsung.com> From: Sumit Semwal This patch adds support for DMABUF memory type in videobuf2. It calls relevant APIs of dma_buf for v4l reqbuf / qbuf / dqbuf operations. For this version, the support is for videobuf2 as a user of the shared buffer; so the allocation of the buffer is done outside of V4L2. [A sample allocator of dma-buf shared buffer is given at [1]] [1]: Rob Clark's DRM: https://github.com/robclark/kernel-omap4/commits/drmplane-dmabuf Signed-off-by: Tomasz Stanislawski [original work in the PoC for buffer sharing] Signed-off-by: Sumit Semwal Signed-off-by: Sumit Semwal Acked-by: Laurent Pinchart --- drivers/media/video/videobuf2-core.c | 196 +++++++++++++++++++++++++++++++++- include/media/videobuf2-core.h | 27 +++++ 2 files changed, 219 insertions(+), 4 deletions(-) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index 9d4e9ed..f43cfa4 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -109,6 +109,36 @@ static void __vb2_buf_userptr_put(struct vb2_buffer *vb) } /** + * __vb2_plane_dmabuf_put() - release memory associated with + * a DMABUF shared plane + */ +static void __vb2_plane_dmabuf_put(struct vb2_queue *q, struct vb2_plane *p) +{ + if (!p->mem_priv) + return; + + if (p->dbuf_mapped) + call_memop(q, unmap_dmabuf, p->mem_priv); + + call_memop(q, detach_dmabuf, p->mem_priv); + dma_buf_put(p->dbuf); + memset(p, 0, sizeof *p); +} + +/** + * __vb2_buf_dmabuf_put() - release memory associated with + * a DMABUF shared buffer + */ +static void __vb2_buf_dmabuf_put(struct vb2_buffer *vb) +{ + struct vb2_queue *q = vb->vb2_queue; + unsigned int plane; + + for (plane = 0; plane < vb->num_planes; ++plane) + __vb2_plane_dmabuf_put(q, &vb->planes[plane]); +} + +/** * __setup_offsets() - setup unique offsets ("cookies") for every plane in * every buffer on the queue */ @@ -230,6 +260,8 @@ static void __vb2_free_mem(struct vb2_queue *q, unsigned int buffers) /* Free MMAP buffers or release USERPTR buffers */ if (q->memory == V4L2_MEMORY_MMAP) __vb2_buf_mem_free(vb); + else if (q->memory == V4L2_MEMORY_DMABUF) + __vb2_buf_dmabuf_put(vb); else __vb2_buf_userptr_put(vb); } @@ -352,6 +384,12 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b) */ memcpy(b->m.planes, vb->v4l2_planes, b->length * sizeof(struct v4l2_plane)); + + if (q->memory == V4L2_MEMORY_DMABUF) { + unsigned int plane; + for (plane = 0; plane < vb->num_planes; ++plane) + b->m.planes[plane].m.fd = 0; + } } else { /* * We use length and offset in v4l2_planes array even for @@ -363,6 +401,8 @@ static int __fill_v4l2_buffer(struct vb2_buffer *vb, struct v4l2_buffer *b) b->m.offset = vb->v4l2_planes[0].m.mem_offset; else if (q->memory == V4L2_MEMORY_USERPTR) b->m.userptr = vb->v4l2_planes[0].m.userptr; + else if (q->memory == V4L2_MEMORY_DMABUF) + b->m.fd = 0; } /* @@ -454,6 +494,20 @@ static int __verify_mmap_ops(struct vb2_queue *q) } /** + * __verify_dmabuf_ops() - verify that all memory operations required for + * DMABUF queue type have been provided + */ +static int __verify_dmabuf_ops(struct vb2_queue *q) +{ + if (!(q->io_modes & VB2_DMABUF) || !q->mem_ops->attach_dmabuf || + !q->mem_ops->detach_dmabuf || !q->mem_ops->map_dmabuf || + !q->mem_ops->unmap_dmabuf) + return -EINVAL; + + return 0; +} + +/** * vb2_reqbufs() - Initiate streaming * @q: videobuf2 queue * @req: struct passed from userspace to vidioc_reqbufs handler in driver @@ -486,8 +540,9 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) return -EBUSY; } - if (req->memory != V4L2_MEMORY_MMAP - && req->memory != V4L2_MEMORY_USERPTR) { + if (req->memory != V4L2_MEMORY_MMAP && + req->memory != V4L2_MEMORY_DMABUF && + req->memory != V4L2_MEMORY_USERPTR) { dprintk(1, "reqbufs: unsupported memory type\n"); return -EINVAL; } @@ -516,6 +571,11 @@ int vb2_reqbufs(struct vb2_queue *q, struct v4l2_requestbuffers *req) return -EINVAL; } + if (req->memory == V4L2_MEMORY_DMABUF && __verify_dmabuf_ops(q)) { + dprintk(1, "reqbufs: DMABUF for current setup unsupported\n"); + return -EINVAL; + } + if (req->count == 0 || q->num_buffers != 0 || q->memory != req->memory) { /* * We already have buffers allocated, so first check if they @@ -622,8 +682,9 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) return -EBUSY; } - if (create->memory != V4L2_MEMORY_MMAP - && create->memory != V4L2_MEMORY_USERPTR) { + if (create->memory != V4L2_MEMORY_MMAP && + create->memory != V4L2_MEMORY_USERPTR && + create->memory != V4L2_MEMORY_DMABUF) { dprintk(1, "%s(): unsupported memory type\n", __func__); return -EINVAL; } @@ -647,6 +708,11 @@ int vb2_create_bufs(struct vb2_queue *q, struct v4l2_create_buffers *create) return -EINVAL; } + if (create->memory == V4L2_MEMORY_DMABUF && __verify_dmabuf_ops(q)) { + dprintk(1, "%s(): DMABUF for current setup unsupported\n", __func__); + return -EINVAL; + } + if (q->num_buffers == VIDEO_MAX_FRAME) { dprintk(1, "%s(): maximum number of buffers already allocated\n", __func__); @@ -842,6 +908,14 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b, b->m.planes[plane].length; } } + if (b->memory == V4L2_MEMORY_DMABUF) { + for (plane = 0; plane < vb->num_planes; ++plane) { + v4l2_planes[plane].bytesused = + b->m.planes[plane].bytesused; + v4l2_planes[plane].m.fd = + b->m.planes[plane].m.fd; + } + } } else { /* * Single-planar buffers do not use planes array, @@ -856,6 +930,10 @@ static int __fill_vb2_buffer(struct vb2_buffer *vb, const struct v4l2_buffer *b, v4l2_planes[0].m.userptr = b->m.userptr; v4l2_planes[0].length = b->length; } + + if (b->memory == V4L2_MEMORY_DMABUF) + v4l2_planes[0].m.fd = b->m.fd; + } vb->v4l2_buf.field = b->field; @@ -960,6 +1038,100 @@ static int __qbuf_mmap(struct vb2_buffer *vb, const struct v4l2_buffer *b) } /** + * __qbuf_dmabuf() - handle qbuf of a DMABUF buffer + */ +static int __qbuf_dmabuf(struct vb2_buffer *vb, const struct v4l2_buffer *b) +{ + struct v4l2_plane planes[VIDEO_MAX_PLANES]; + struct vb2_queue *q = vb->vb2_queue; + void *mem_priv; + unsigned int plane; + int ret; + int write = !V4L2_TYPE_IS_OUTPUT(q->type); + + /* Verify and copy relevant information provided by the userspace */ + ret = __fill_vb2_buffer(vb, b, planes); + if (ret) + return ret; + + for (plane = 0; plane < vb->num_planes; ++plane) { + struct dma_buf *dbuf = dma_buf_get(planes[plane].m.fd); + + if (IS_ERR_OR_NULL(dbuf)) { + dprintk(1, "qbuf: invalid dmabuf fd for " + "plane %d\n", plane); + ret = -EINVAL; + goto err; + } + + /* Skip the plane if already verified */ + if (dbuf == vb->planes[plane].dbuf) { + planes[plane].length = dbuf->size; + dma_buf_put(dbuf); + continue; + } + + dprintk(3, "qbuf: buffer description for plane %d changed, " + "reattaching dma buf\n", plane); + + /* Release previously acquired memory if present */ + __vb2_plane_dmabuf_put(q, &vb->planes[plane]); + + /* Acquire each plane's memory */ + mem_priv = call_memop(q, attach_dmabuf, q->alloc_ctx[plane], + dbuf, q->plane_sizes[plane], write); + if (IS_ERR(mem_priv)) { + dprintk(1, "qbuf: failed acquiring dmabuf " + "memory for plane %d\n", plane); + ret = PTR_ERR(mem_priv); + goto err; + } + + planes[plane].length = dbuf->size; + vb->planes[plane].dbuf = dbuf; + vb->planes[plane].mem_priv = mem_priv; + } + + /* TODO: This pins the buffer(s) with dma_buf_map_attachment()).. but + * really we want to do this just before the DMA, not while queueing + * the buffer(s).. + */ + for (plane = 0; plane < vb->num_planes; ++plane) { + ret = call_memop(q, map_dmabuf, vb->planes[plane].mem_priv); + if (ret) { + dprintk(1, "qbuf: failed mapping dmabuf " + "memory for plane %d\n", plane); + goto err; + } + vb->planes[plane].dbuf_mapped = 1; + } + + /* + * Call driver-specific initialization on the newly acquired buffer, + * if provided. + */ + ret = call_qop(q, buf_init, vb); + if (ret) { + dprintk(1, "qbuf: buffer initialization failed\n"); + goto err; + } + + /* + * Now that everything is in order, copy relevant information + * provided by userspace. + */ + for (plane = 0; plane < vb->num_planes; ++plane) + vb->v4l2_planes[plane] = planes[plane]; + + return 0; +err: + /* In case of errors, release planes that were already acquired */ + __vb2_buf_dmabuf_put(vb); + + return ret; +} + +/** * __enqueue_in_driver() - enqueue a vb2_buffer in driver for processing */ static void __enqueue_in_driver(struct vb2_buffer *vb) @@ -983,6 +1155,9 @@ static int __buf_prepare(struct vb2_buffer *vb, const struct v4l2_buffer *b) case V4L2_MEMORY_USERPTR: ret = __qbuf_userptr(vb, b); break; + case V4L2_MEMORY_DMABUF: + ret = __qbuf_dmabuf(vb, b); + break; default: WARN(1, "Invalid queue type\n"); ret = -EINVAL; @@ -1338,6 +1513,19 @@ int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking) return ret; } + /* TODO: this unpins the buffer(dma_buf_unmap_attachment()).. but + * really we want to do this just after DMA, not when the + * buffer is dequeued.. + */ + if (q->memory == V4L2_MEMORY_DMABUF) { + unsigned int i; + + for (i = 0; i < vb->num_planes; ++i) { + call_memop(q, unmap_dmabuf, vb->planes[i].mem_priv); + vb->planes[i].dbuf_mapped = 0; + } + } + switch (vb->state) { case VB2_BUF_STATE_DONE: dprintk(3, "dqbuf: Returning done buffer\n"); diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index a15d1f1..859bbaf 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -16,6 +16,7 @@ #include #include #include +#include struct vb2_alloc_ctx; struct vb2_fileio_data; @@ -41,6 +42,20 @@ struct vb2_fileio_data; * argument to other ops in this structure * @put_userptr: inform the allocator that a USERPTR buffer will no longer * be used + * @attach_dmabuf: attach a shared struct dma_buf for a hardware operation; + * used for DMABUF memory types; alloc_ctx is the alloc context + * dbuf is the shared dma_buf; returns NULL on failure; + * allocator private per-buffer structure on success; + * this needs to be used for further accesses to the buffer + * @detach_dmabuf: inform the exporter of the buffer that the current DMABUF + * buffer is no longer used; the buf_priv argument is the + * allocator private per-buffer structure previously returned + * from the attach_dmabuf callback + * @map_dmabuf: request for access to the dmabuf from allocator; the allocator + * of dmabuf is informed that this driver is going to use the + * dmabuf + * @unmap_dmabuf: releases access control to the dmabuf - allocator is notified + * that this driver is done using the dmabuf for now * @vaddr: return a kernel virtual address to a given memory buffer * associated with the passed private structure or NULL if no * such mapping exists @@ -56,6 +71,8 @@ struct vb2_fileio_data; * Required ops for USERPTR types: get_userptr, put_userptr. * Required ops for MMAP types: alloc, put, num_users, mmap. * Required ops for read/write access types: alloc, put, num_users, vaddr + * Required ops for DMABUF types: attach_dmabuf, detach_dmabuf, map_dmabuf, + * unmap_dmabuf. */ struct vb2_mem_ops { void *(*alloc)(void *alloc_ctx, unsigned long size); @@ -65,6 +82,12 @@ struct vb2_mem_ops { unsigned long size, int write); void (*put_userptr)(void *buf_priv); + void *(*attach_dmabuf)(void *alloc_ctx, struct dma_buf *dbuf, + unsigned long size, int write); + void (*detach_dmabuf)(void *buf_priv); + int (*map_dmabuf)(void *buf_priv); + void (*unmap_dmabuf)(void *buf_priv); + void *(*vaddr)(void *buf_priv); void *(*cookie)(void *buf_priv); @@ -75,6 +98,8 @@ struct vb2_mem_ops { struct vb2_plane { void *mem_priv; + struct dma_buf *dbuf; + unsigned int dbuf_mapped; }; /** @@ -83,12 +108,14 @@ struct vb2_plane { * @VB2_USERPTR: driver supports USERPTR with streaming API * @VB2_READ: driver supports read() style access * @VB2_WRITE: driver supports write() style access + * @VB2_DMABUF: driver supports DMABUF with streaming API */ enum vb2_io_modes { VB2_MMAP = (1 << 0), VB2_USERPTR = (1 << 1), VB2_READ = (1 << 2), VB2_WRITE = (1 << 3), + VB2_DMABUF = (1 << 4), }; /** -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:19 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:19 +0200 Subject: [Linaro-mm-sig] [PATCHv6 05/13] v4l: vb2-dma-contig: Shorten vb2_dma_contig prefix to vb2_dc In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-6-git-send-email-t.stanislaws@samsung.com> From: Laurent Pinchart Signed-off-by: Laurent Pinchart --- drivers/media/video/videobuf2-dma-contig.c | 36 ++++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 4b71326..a05784f 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -32,9 +32,9 @@ struct vb2_dc_buf { struct vb2_vmarea_handler handler; }; -static void vb2_dma_contig_put(void *buf_priv); +static void vb2_dc_put(void *buf_priv); -static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size) +static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) { struct vb2_dc_conf *conf = alloc_ctx; struct vb2_dc_buf *buf; @@ -56,7 +56,7 @@ static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size) buf->size = size; buf->handler.refcount = &buf->refcount; - buf->handler.put = vb2_dma_contig_put; + buf->handler.put = vb2_dc_put; buf->handler.arg = buf; atomic_inc(&buf->refcount); @@ -64,7 +64,7 @@ static void *vb2_dma_contig_alloc(void *alloc_ctx, unsigned long size) return buf; } -static void vb2_dma_contig_put(void *buf_priv) +static void vb2_dc_put(void *buf_priv) { struct vb2_dc_buf *buf = buf_priv; @@ -75,14 +75,14 @@ static void vb2_dma_contig_put(void *buf_priv) } } -static void *vb2_dma_contig_cookie(void *buf_priv) +static void *vb2_dc_cookie(void *buf_priv) { struct vb2_dc_buf *buf = buf_priv; return &buf->dma_addr; } -static void *vb2_dma_contig_vaddr(void *buf_priv) +static void *vb2_dc_vaddr(void *buf_priv) { struct vb2_dc_buf *buf = buf_priv; if (!buf) @@ -91,14 +91,14 @@ static void *vb2_dma_contig_vaddr(void *buf_priv) return buf->vaddr; } -static unsigned int vb2_dma_contig_num_users(void *buf_priv) +static unsigned int vb2_dc_num_users(void *buf_priv) { struct vb2_dc_buf *buf = buf_priv; return atomic_read(&buf->refcount); } -static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma) +static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dc_buf *buf = buf_priv; @@ -111,7 +111,7 @@ static int vb2_dma_contig_mmap(void *buf_priv, struct vm_area_struct *vma) &vb2_common_vm_ops, &buf->handler); } -static void *vb2_dma_contig_get_userptr(void *alloc_ctx, unsigned long vaddr, +static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, unsigned long size, int write) { struct vb2_dc_buf *buf; @@ -138,7 +138,7 @@ static void *vb2_dma_contig_get_userptr(void *alloc_ctx, unsigned long vaddr, return buf; } -static void vb2_dma_contig_put_userptr(void *mem_priv) +static void vb2_dc_put_userptr(void *mem_priv) { struct vb2_dc_buf *buf = mem_priv; @@ -150,14 +150,14 @@ static void vb2_dma_contig_put_userptr(void *mem_priv) } const struct vb2_mem_ops vb2_dma_contig_memops = { - .alloc = vb2_dma_contig_alloc, - .put = vb2_dma_contig_put, - .cookie = vb2_dma_contig_cookie, - .vaddr = vb2_dma_contig_vaddr, - .mmap = vb2_dma_contig_mmap, - .get_userptr = vb2_dma_contig_get_userptr, - .put_userptr = vb2_dma_contig_put_userptr, - .num_users = vb2_dma_contig_num_users, + .alloc = vb2_dc_alloc, + .put = vb2_dc_put, + .cookie = vb2_dc_cookie, + .vaddr = vb2_dc_vaddr, + .mmap = vb2_dc_mmap, + .get_userptr = vb2_dc_get_userptr, + .put_userptr = vb2_dc_put_userptr, + .num_users = vb2_dc_num_users, }; EXPORT_SYMBOL_GPL(vb2_dma_contig_memops); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:24 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:24 +0200 Subject: [Linaro-mm-sig] [PATCHv6 10/13] v4l: vb2-dma-contig: add prepare/finish to dma-contig allocator In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-11-git-send-email-t.stanislaws@samsung.com> From: Marek Szyprowski Add prepare/finish callbacks to vb2-dma-contig allocator. Signed-off-by: Marek Szyprowski --- drivers/media/video/videobuf2-dma-contig.c | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 068ec11..bb32e7e 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -150,6 +150,28 @@ static unsigned int vb2_dc_num_users(void *buf_priv) return atomic_read(&buf->refcount); } +static void vb2_dc_prepare(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + struct sg_table *sgt = buf->dma_sgt; + + if (!sgt) + return; + + dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); +} + +static void vb2_dc_finish(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + struct sg_table *sgt = buf->dma_sgt; + + if (!sgt) + return; + + dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); +} + /*********************************************/ /* callbacks for MMAP buffers */ /*********************************************/ @@ -403,6 +425,8 @@ const struct vb2_mem_ops vb2_dma_contig_memops = { .mmap = vb2_dc_mmap, .get_userptr = vb2_dc_get_userptr, .put_userptr = vb2_dc_put_userptr, + .prepare = vb2_dc_prepare, + .finish = vb2_dc_finish, .num_users = vb2_dc_num_users, }; EXPORT_SYMBOL_GPL(vb2_dma_contig_memops); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:21 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:21 +0200 Subject: [Linaro-mm-sig] [PATCHv6 07/13] v4l: vb2-dma-contig: Reorder functions In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-8-git-send-email-t.stanislaws@samsung.com> From: Laurent Pinchart Group functions by buffer type. Signed-off-by: Laurent Pinchart --- drivers/media/video/videobuf2-dma-contig.c | 92 ++++++++++++++++------------ 1 file changed, 54 insertions(+), 38 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index a019cd1..42c6431 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -21,14 +21,56 @@ struct vb2_dc_buf { struct device *dev; void *vaddr; - dma_addr_t dma_addr; unsigned long size; - struct vm_area_struct *vma; - atomic_t refcount; + dma_addr_t dma_addr; + + /* MMAP related */ struct vb2_vmarea_handler handler; + atomic_t refcount; + + /* USERPTR related */ + struct vm_area_struct *vma; }; -static void vb2_dc_put(void *buf_priv); +/*********************************************/ +/* callbacks for all buffers */ +/*********************************************/ + +static void *vb2_dc_cookie(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + + return &buf->dma_addr; +} + +static void *vb2_dc_vaddr(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + + return buf->vaddr; +} + +static unsigned int vb2_dc_num_users(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + + return atomic_read(&buf->refcount); +} + +/*********************************************/ +/* callbacks for MMAP buffers */ +/*********************************************/ + +static void vb2_dc_put(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + + if (!atomic_dec_and_test(&buf->refcount)) + return; + + dma_free_coherent(buf->dev, buf->size, buf->vaddr, buf->dma_addr); + kfree(buf); +} static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) { @@ -58,40 +100,6 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) return buf; } -static void vb2_dc_put(void *buf_priv) -{ - struct vb2_dc_buf *buf = buf_priv; - - if (atomic_dec_and_test(&buf->refcount)) { - dma_free_coherent(buf->dev, buf->size, buf->vaddr, - buf->dma_addr); - kfree(buf); - } -} - -static void *vb2_dc_cookie(void *buf_priv) -{ - struct vb2_dc_buf *buf = buf_priv; - - return &buf->dma_addr; -} - -static void *vb2_dc_vaddr(void *buf_priv) -{ - struct vb2_dc_buf *buf = buf_priv; - if (!buf) - return NULL; - - return buf->vaddr; -} - -static unsigned int vb2_dc_num_users(void *buf_priv) -{ - struct vb2_dc_buf *buf = buf_priv; - - return atomic_read(&buf->refcount); -} - static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dc_buf *buf = buf_priv; @@ -105,6 +113,10 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) &vb2_common_vm_ops, &buf->handler); } +/*********************************************/ +/* callbacks for USERPTR buffers */ +/*********************************************/ + static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, unsigned long size, int write) { @@ -143,6 +155,10 @@ static void vb2_dc_put_userptr(void *mem_priv) kfree(buf); } +/*********************************************/ +/* DMA CONTIG exported functions */ +/*********************************************/ + const struct vb2_mem_ops vb2_dma_contig_memops = { .alloc = vb2_dc_alloc, .put = vb2_dc_put, -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:26 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:26 +0200 Subject: [Linaro-mm-sig] [PATCHv6 12/13] v4l: s5p-tv: mixer: support for dmabuf importing In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-13-git-send-email-t.stanislaws@samsung.com> This patch enhances s5p-tv with support for DMABUF importing via V4L2_MEMORY_DMABUF memory type. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/s5p-tv/Kconfig | 1 + drivers/media/video/s5p-tv/mixer_video.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/s5p-tv/Kconfig b/drivers/media/video/s5p-tv/Kconfig index f248b28..2e80126 100644 --- a/drivers/media/video/s5p-tv/Kconfig +++ b/drivers/media/video/s5p-tv/Kconfig @@ -10,6 +10,7 @@ config VIDEO_SAMSUNG_S5P_TV bool "Samsung TV driver for S5P platform (experimental)" depends on PLAT_S5P && PM_RUNTIME depends on EXPERIMENTAL + select DMA_SHARED_BUFFER default n ---help--- Say Y here to enable selecting the TV output devices for diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index 33fde2a..cff974a 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -1078,7 +1078,7 @@ struct mxr_layer *mxr_base_layer_create(struct mxr_device *mdev, layer->vb_queue = (struct vb2_queue) { .type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE, - .io_modes = VB2_MMAP | VB2_USERPTR, + .io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF, .drv_priv = layer, .buf_struct_size = sizeof(struct mxr_buffer), .ops = &mxr_video_qops, -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:23 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:23 +0200 Subject: [Linaro-mm-sig] [PATCHv6 09/13] v4l: vb2: add prepare/finish callbacks to allocators In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-10-git-send-email-t.stanislaws@samsung.com> From: Marek Szyprowski This patch adds support for prepare/finish callbacks in VB2 allocators. These callback are used for buffer flushing. Signed-off-by: Marek Szyprowski Acked-by: Laurent Pinchart --- drivers/media/video/videobuf2-core.c | 11 +++++++++++ include/media/videobuf2-core.h | 7 +++++++ 2 files changed, 18 insertions(+) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index f43cfa4..d60ed25 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -845,6 +845,7 @@ void vb2_buffer_done(struct vb2_buffer *vb, enum vb2_buffer_state state) { struct vb2_queue *q = vb->vb2_queue; unsigned long flags; + unsigned int plane; if (vb->state != VB2_BUF_STATE_ACTIVE) return; @@ -855,6 +856,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; @@ -1137,9 +1142,15 @@ err: static void __enqueue_in_driver(struct vb2_buffer *vb) { struct vb2_queue *q = vb->vb2_queue; + unsigned 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 859bbaf..d079f92 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -56,6 +56,10 @@ struct vb2_fileio_data; * dmabuf * @unmap_dmabuf: releases access control to the dmabuf - allocator is notified * that this driver is done using the dmabuf for now + * @prepare: called everytime the buffer is passed from userspace to the + * driver, usefull for cache synchronisation, optional + * @finish: called everytime the buffer is passed back from the driver + * to the userspace, also optional * @vaddr: return a kernel virtual address to a given memory buffer * associated with the passed private structure or NULL if no * such mapping exists @@ -82,6 +86,9 @@ struct vb2_mem_ops { unsigned long size, int write); void (*put_userptr)(void *buf_priv); + void (*prepare)(void *buf_priv); + void (*finish)(void *buf_priv); + void *(*attach_dmabuf)(void *alloc_ctx, struct dma_buf *dbuf, unsigned long size, int write); void (*detach_dmabuf)(void *buf_priv); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:27 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:27 +0200 Subject: [Linaro-mm-sig] [PATCHv6 13/13] v4l: s5p-fimc: support for dmabuf importing In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-14-git-send-email-t.stanislaws@samsung.com> This patch enhances s5p-fimc with support for DMABUF importing via V4L2_MEMORY_DMABUF memory type. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park Acked-by: Sylwester Nawrocki --- drivers/media/video/s5p-fimc/Kconfig | 1 + drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/media/video/s5p-fimc/Kconfig b/drivers/media/video/s5p-fimc/Kconfig index a564f7e..3106026 100644 --- a/drivers/media/video/s5p-fimc/Kconfig +++ b/drivers/media/video/s5p-fimc/Kconfig @@ -14,6 +14,7 @@ config VIDEO_S5P_FIMC depends on I2C select VIDEOBUF2_DMA_CONTIG select V4L2_MEM2MEM_DEV + select DMA_SHARED_BUFFER help This is a V4L2 driver for Samsung S5P and EXYNOS4 SoC camera host interface and video postprocessor (FIMC and FIMC-LITE) devices. diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index 3545745..cd27e33 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -1609,7 +1609,7 @@ static int fimc_register_capture_device(struct fimc_dev *fimc, q = &fimc->vid_cap.vbq; memset(q, 0, sizeof(*q)); q->type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE; - q->io_modes = VB2_MMAP | VB2_USERPTR; + q->io_modes = VB2_MMAP | VB2_USERPTR | VB2_DMABUF; q->drv_priv = fimc->vid_cap.ctx; q->ops = &fimc_capture_qops; q->mem_ops = &vb2_dma_contig_memops; -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:22 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:22 +0200 Subject: [Linaro-mm-sig] [PATCHv6 08/13] v4l: vb2-dma-contig: add support for scatterlist in userptr mode In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-9-git-send-email-t.stanislaws@samsung.com> This patch introduces usage of dma_map_sg to map memory behind a userspace pointer to a device as dma-contiguous mapping. This patch contains some of the code kindly provided by Marek Szyprowski and Kamil Debski and Andrzej Pietrasiewicz . Kind thanks for bug reports from Laurent Pinchart and Seung-Woo Kim . Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park Acked-by: Laurent Pinchart --- drivers/media/video/videobuf2-dma-contig.c | 268 ++++++++++++++++++++++++++-- 1 file changed, 252 insertions(+), 16 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 42c6431..068ec11 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -11,6 +11,8 @@ */ #include +#include +#include #include #include @@ -23,6 +25,8 @@ struct vb2_dc_buf { void *vaddr; unsigned long size; dma_addr_t dma_addr; + enum dma_data_direction dma_dir; + struct sg_table *dma_sgt; /* MMAP related */ struct vb2_vmarea_handler handler; @@ -33,6 +37,95 @@ struct vb2_dc_buf { }; /*********************************************/ +/* scatterlist table functions */ +/*********************************************/ + +static struct sg_table *vb2_dc_pages_to_sgt(struct page **pages, + unsigned int n_pages, unsigned long offset, unsigned long size) +{ + struct sg_table *sgt; + unsigned int chunks; + unsigned int i; + unsigned int cur_page; + int ret; + struct scatterlist *s; + + sgt = kzalloc(sizeof *sgt, GFP_KERNEL); + if (!sgt) + return ERR_PTR(-ENOMEM); + + /* compute number of chunks */ + chunks = 1; + for (i = 1; i < n_pages; ++i) + if (pages[i] != pages[i - 1] + 1) + ++chunks; + + ret = sg_alloc_table(sgt, chunks, GFP_KERNEL); + if (ret) { + kfree(sgt); + return ERR_PTR(-ENOMEM); + } + + /* merging chunks and putting them into the scatterlist */ + cur_page = 0; + for_each_sg(sgt->sgl, s, sgt->orig_nents, i) { + unsigned long chunk_size; + unsigned int j; + + for (j = cur_page + 1; j < n_pages; ++j) + if (pages[j] != pages[j - 1] + 1) + break; + + chunk_size = ((j - cur_page) << PAGE_SHIFT) - offset; + sg_set_page(s, pages[cur_page], min(size, chunk_size), offset); + size -= chunk_size; + offset = 0; + cur_page = j; + } + + return sgt; +} + +static void vb2_dc_release_sgtable(struct sg_table *sgt) +{ + sg_free_table(sgt); + kfree(sgt); +} + +static void vb2_dc_sgt_foreach_page(struct sg_table *sgt, + void (*cb)(struct page *pg)) +{ + struct scatterlist *s; + unsigned int i; + + for_each_sg(sgt->sgl, s, sgt->nents, i) { + struct page *page = sg_page(s); + unsigned int n_pages = PAGE_ALIGN(s->offset + s->length) + >> PAGE_SHIFT; + unsigned int j; + + for (j = 0; j < n_pages; ++j, ++page) + cb(page); + } +} + +static unsigned long vb2_dc_get_contiguous_size(struct sg_table *sgt) +{ + struct scatterlist *s; + dma_addr_t expected = sg_dma_address(sgt->sgl); + unsigned int i; + unsigned long size = 0; + + for_each_sg(sgt->sgl, s, sgt->nents, i) { + if (sg_dma_address(s) != expected) + break; + expected = sg_dma_address(s) + sg_dma_len(s); + size += sg_dma_len(s); + } + return size; +} + +/*********************************************/ /* callbacks for all buffers */ /*********************************************/ @@ -117,42 +210,185 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) /* callbacks for USERPTR buffers */ /*********************************************/ +static inline int vma_is_io(struct vm_area_struct *vma) +{ + return !!(vma->vm_flags & (VM_IO | VM_PFNMAP)); +} + +static int vb2_dc_get_user_pages(unsigned long start, struct page **pages, + int n_pages, struct vm_area_struct *vma, int write) +{ + if (vma_is_io(vma)) { + unsigned int i; + + for (i = 0; i < n_pages; ++i, start += PAGE_SIZE) { + unsigned long pfn; + int ret = follow_pfn(vma, start, &pfn); + + if (ret) { + printk(KERN_ERR "no page for address %lu\n", + start); + return ret; + } + pages[i] = pfn_to_page(pfn); + } + } else { + int n; + + n = get_user_pages(current, current->mm, start & PAGE_MASK, + n_pages, write, 1, pages, NULL); + /* negative error means that no page was pinned */ + n = max(n, 0); + if (n != n_pages) { + printk(KERN_ERR "got only %d of %d user pages\n", + n, n_pages); + while (n) + put_page(pages[--n]); + return -EFAULT; + } + } + + return 0; +} + +static void vb2_dc_put_dirty_page(struct page *page) +{ + set_page_dirty_lock(page); + put_page(page); +} + +static void vb2_dc_put_userptr(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + struct sg_table *sgt = buf->dma_sgt; + + dma_unmap_sg(buf->dev, sgt->sgl, sgt->orig_nents, buf->dma_dir); + if (!vma_is_io(buf->vma)) + vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page); + + vb2_dc_release_sgtable(sgt); + vb2_put_vma(buf->vma); + kfree(buf); +} + static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, - unsigned long size, int write) + unsigned long size, int write) { struct vb2_dc_buf *buf; + unsigned long start; + unsigned long end; + unsigned long offset; + struct page **pages; + int n_pages; + int ret = 0; struct vm_area_struct *vma; - dma_addr_t dma_addr = 0; - int ret; + struct sg_table *sgt; + unsigned long contig_size; buf = kzalloc(sizeof *buf, GFP_KERNEL); if (!buf) return ERR_PTR(-ENOMEM); - ret = vb2_get_contig_userptr(vaddr, size, &vma, &dma_addr); + buf->dev = alloc_ctx; + buf->dma_dir = write ? DMA_FROM_DEVICE : DMA_TO_DEVICE; + + start = vaddr & PAGE_MASK; + offset = vaddr & ~PAGE_MASK; + end = PAGE_ALIGN(vaddr + size); + n_pages = (end - start) >> PAGE_SHIFT; + + pages = kmalloc(n_pages * sizeof pages[0], GFP_KERNEL); + if (!pages) { + ret = -ENOMEM; + printk(KERN_ERR "failed to allocate pages table\n"); + goto fail_buf; + } + + /* current->mm->mmap_sem is taken by videobuf2 core */ + vma = find_vma(current->mm, vaddr); + if (!vma) { + printk(KERN_ERR "no vma for address %lu\n", vaddr); + ret = -EFAULT; + goto fail_pages; + } + + if (vma->vm_end < vaddr + size) { + printk(KERN_ERR "vma at %lu is too small for %lu bytes\n", + vaddr, size); + ret = -EFAULT; + goto fail_pages; + } + + buf->vma = vb2_get_vma(vma); + if (!buf->vma) { + printk(KERN_ERR "failed to copy vma\n"); + ret = -ENOMEM; + goto fail_pages; + } + + /* extract page list from userspace mapping */ + ret = vb2_dc_get_user_pages(start, pages, n_pages, vma, write); if (ret) { - printk(KERN_ERR "Failed acquiring VMA for vaddr 0x%08lx\n", - vaddr); - kfree(buf); - return ERR_PTR(ret); + printk(KERN_ERR "failed to get user pages\n"); + goto fail_vma; + } + + sgt = vb2_dc_pages_to_sgt(pages, n_pages, offset, size); + if (IS_ERR(sgt)) { + printk(KERN_ERR "failed to create scatterlist table\n"); + ret = -ENOMEM; + goto fail_get_user_pages; } + /* pages are no longer needed */ + kfree(pages); + pages = NULL; + + sgt->nents = dma_map_sg(buf->dev, sgt->sgl, sgt->orig_nents, + buf->dma_dir); + if (sgt->nents <= 0) { + printk(KERN_ERR "failed to map scatterlist\n"); + ret = -EIO; + goto fail_sgt; + } + + contig_size = vb2_dc_get_contiguous_size(sgt); + if (contig_size < size) { + printk(KERN_ERR "contiguous mapping is too small %lu/%lu\n", + contig_size, size); + ret = -EFAULT; + goto fail_map_sg; + } + + buf->dma_addr = sg_dma_address(sgt->sgl); buf->size = size; - buf->dma_addr = dma_addr; - buf->vma = vma; + buf->dma_sgt = sgt; return buf; -} -static void vb2_dc_put_userptr(void *mem_priv) -{ - struct vb2_dc_buf *buf = mem_priv; +fail_map_sg: + dma_unmap_sg(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); - if (!buf) - return; +fail_sgt: + if (!vma_is_io(buf->vma)) + vb2_dc_sgt_foreach_page(sgt, put_page); + vb2_dc_release_sgtable(sgt); +fail_get_user_pages: + if (pages && !vma_is_io(buf->vma)) + while (n_pages) + put_page(pages[--n_pages]); + +fail_vma: vb2_put_vma(buf->vma); + +fail_pages: + kfree(pages); /* kfree is NULL-proof */ + +fail_buf: kfree(buf); + + return ERR_PTR(ret); } /*********************************************/ -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 12:10:25 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 14:10:25 +0200 Subject: [Linaro-mm-sig] [PATCHv6 11/13] v4l: vb2-dma-contig: add support for dma_buf importing In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337775027-9489-12-git-send-email-t.stanislaws@samsung.com> From: Sumit Semwal This patch makes changes for adding dma-contig as a dma_buf user. It provides function implementations for the {attach, detach, map, unmap}_dmabuf() mem_ops of DMABUF memory type. Signed-off-by: Sumit Semwal Signed-off-by: Sumit Semwal [author of the original patch] Signed-off-by: Tomasz Stanislawski [integration with refactored dma-contig allocator] Acked-by: Laurent Pinchart --- drivers/media/video/videobuf2-dma-contig.c | 119 +++++++++++++++++++++++++++- 1 file changed, 117 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index bb32e7e..9c213bc 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -10,6 +10,7 @@ * the Free Software Foundation. */ +#include #include #include #include @@ -34,6 +35,9 @@ struct vb2_dc_buf { /* USERPTR related */ struct vm_area_struct *vma; + + /* DMABUF related */ + struct dma_buf_attachment *db_attach; }; /*********************************************/ @@ -155,7 +159,8 @@ static void vb2_dc_prepare(void *buf_priv) struct vb2_dc_buf *buf = buf_priv; struct sg_table *sgt = buf->dma_sgt; - if (!sgt) + /* DMABUF exporter will flush the cache for us */ + if (!sgt || buf->db_attach) return; dma_sync_sg_for_device(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); @@ -166,7 +171,8 @@ static void vb2_dc_finish(void *buf_priv) struct vb2_dc_buf *buf = buf_priv; struct sg_table *sgt = buf->dma_sgt; - if (!sgt) + /* DMABUF exporter will flush the cache for us */ + if (!sgt || buf->db_attach) return; dma_sync_sg_for_cpu(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); @@ -414,6 +420,111 @@ fail_buf: } /*********************************************/ +/* callbacks for DMABUF buffers */ +/*********************************************/ + +static int vb2_dc_map_dmabuf(void *mem_priv) +{ + struct vb2_dc_buf *buf = mem_priv; + struct sg_table *sgt; + unsigned long contig_size; + + if (WARN_ON(!buf->db_attach)) { + printk(KERN_ERR "trying to pin a non attached buffer\n"); + return -EINVAL; + } + + if (WARN_ON(buf->dma_sgt)) { + printk(KERN_ERR "dmabuf buffer is already pinned\n"); + return 0; + } + + /* get the associated scatterlist for this buffer */ + sgt = dma_buf_map_attachment(buf->db_attach, buf->dma_dir); + if (IS_ERR_OR_NULL(sgt)) { + printk(KERN_ERR "Error getting dmabuf scatterlist\n"); + return -EINVAL; + } + + /* checking if dmabuf is big enough to store contiguous chunk */ + contig_size = vb2_dc_get_contiguous_size(sgt); + if (contig_size < buf->size) { + printk(KERN_ERR "contiguous chunk is too small %lu/%lu b\n", + contig_size, buf->size); + dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir); + return -EFAULT; + } + + buf->dma_addr = sg_dma_address(sgt->sgl); + buf->dma_sgt = sgt; + + return 0; +} + +static void vb2_dc_unmap_dmabuf(void *mem_priv) +{ + struct vb2_dc_buf *buf = mem_priv; + struct sg_table *sgt = buf->dma_sgt; + + if (WARN_ON(!buf->db_attach)) { + printk(KERN_ERR "trying to unpin a not attached buffer\n"); + return; + } + + if (WARN_ON(!sgt)) { + printk(KERN_ERR "dmabuf buffer is already unpinned\n"); + return; + } + + dma_buf_unmap_attachment(buf->db_attach, sgt, buf->dma_dir); + + buf->dma_addr = 0; + buf->dma_sgt = NULL; +} + +static void vb2_dc_detach_dmabuf(void *mem_priv) +{ + struct vb2_dc_buf *buf = mem_priv; + + /* if vb2 works correctly you should never detach mapped buffer */ + if (WARN_ON(buf->dma_addr)) + vb2_dc_unmap_dmabuf(buf); + + /* detach this attachment */ + dma_buf_detach(buf->db_attach->dmabuf, buf->db_attach); + kfree(buf); +} + +static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf, + unsigned long size, int write) +{ + struct vb2_dc_buf *buf; + struct dma_buf_attachment *dba; + + if (dbuf->size < size) + return ERR_PTR(-EFAULT); + + buf = kzalloc(sizeof *buf, GFP_KERNEL); + if (!buf) + return ERR_PTR(-ENOMEM); + + buf->dev = alloc_ctx; + /* create attachment for the dmabuf with the user device */ + dba = dma_buf_attach(dbuf, buf->dev); + if (IS_ERR(dba)) { + printk(KERN_ERR "failed to attach dmabuf\n"); + kfree(buf); + return dba; + } + + buf->dma_dir = write ? DMA_FROM_DEVICE : DMA_TO_DEVICE; + buf->size = size; + buf->db_attach = dba; + + return buf; +} + +/*********************************************/ /* DMA CONTIG exported functions */ /*********************************************/ @@ -427,6 +538,10 @@ const struct vb2_mem_ops vb2_dma_contig_memops = { .put_userptr = vb2_dc_put_userptr, .prepare = vb2_dc_prepare, .finish = vb2_dc_finish, + .map_dmabuf = vb2_dc_map_dmabuf, + .unmap_dmabuf = vb2_dc_unmap_dmabuf, + .attach_dmabuf = vb2_dc_attach_dmabuf, + .detach_dmabuf = vb2_dc_detach_dmabuf, .num_users = vb2_dc_num_users, }; EXPORT_SYMBOL_GPL(vb2_dma_contig_memops); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:23 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:23 +0200 Subject: [Linaro-mm-sig] [PATCH 00/12] Support for dmabuf exporting for videobuf2 Message-ID: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Hello everyone, The patches adds support for DMABUF exporting to V4L2 stack. The latest support for DMABUF importing was posted in [1]. The exporter part is dependant on DMA mapping redesign [2] which is not merged into the mainline. Therefore it is posted as a separate patchset. Moreover some patches depends on vmap extension for DMABUF by Dave Airlie [3] and sg_alloc_table_from_pages function [4]. Changelog: v0: (RFC) - updated setup of VIDIOC_EXPBUF ioctl - doc updates - introduced workaround to avoid using dma_get_pages, - removed caching of exported dmabuf to avoid existence of circular reference between dmabuf and vb2_dc_buf or resource leakage - removed all 'change behaviour' patches - inital support for exporting in s5p-mfs driver - removal of vb2_mmap_pfn_range that is no longer used - use sg_alloc_table_from_pages instead of creating sglist in vb2_dc code - move attachment allocation to exporter's attach callback [1] http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/48730 [2] http://thread.gmane.org/gmane.linux.kernel.cross-arch/14098 [3] http://permalink.gmane.org/gmane.comp.video.dri.devel/69302 [4] This patchset is rebased on 3.4-rc1 plus the following patchsets: Marek Szyprowski (1): v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call Tomasz Stanislawski (11): v4l: add buffer exporting via dmabuf v4l: vb2: add buffer exporting via dmabuf v4l: vb2-dma-contig: add setup of sglist for MMAP buffers v4l: vb2-dma-contig: add support for DMABUF exporting v4l: vb2-dma-contig: add vmap/kmap for dmabuf exporting v4l: s5p-fimc: support for dmabuf exporting v4l: s5p-tv: mixer: support for dmabuf exporting v4l: s5p-mfc: support for dmabuf exporting v4l: vb2: remove vb2_mmap_pfn_range function v4l: vb2-dma-contig: use sg_alloc_table_from_pages function v4l: vb2-dma-contig: Move allocation of dbuf attachment to attach cb drivers/media/video/s5p-fimc/fimc-capture.c | 9 + drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 13 ++ drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 13 ++ drivers/media/video/s5p-tv/mixer_video.c | 10 + drivers/media/video/v4l2-compat-ioctl32.c | 1 + drivers/media/video/v4l2-dev.c | 1 + drivers/media/video/v4l2-ioctl.c | 6 + drivers/media/video/videobuf2-core.c | 67 ++++++ drivers/media/video/videobuf2-dma-contig.c | 323 ++++++++++++++++++++++----- drivers/media/video/videobuf2-memops.c | 40 ---- include/linux/videodev2.h | 26 +++ include/media/v4l2-ioctl.h | 2 + include/media/videobuf2-core.h | 2 + include/media/videobuf2-memops.h | 5 - 14 files changed, 411 insertions(+), 107 deletions(-) -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:24 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:24 +0200 Subject: [Linaro-mm-sig] [PATCH 01/12] v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-2-git-send-email-t.stanislaws@samsung.com> From: Marek Szyprowski Let mmap method to use dma_mmap_coherent call. This patch depends on DMA mapping redesign patches because the usage of dma_mmap_coherent breaks dma-contig allocator for architectures other than ARM and AVR. Signed-off-by: Marek Szyprowski --- drivers/media/video/videobuf2-dma-contig.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 9c213bc..52b4f59 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -224,14 +224,38 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) { struct vb2_dc_buf *buf = buf_priv; + int ret; if (!buf) { printk(KERN_ERR "No buffer to map\n"); return -EINVAL; } - return vb2_mmap_pfn_range(vma, buf->dma_addr, buf->size, - &vb2_common_vm_ops, &buf->handler); + /* + * dma_mmap_* uses vm_pgoff as in-buffer offset, but we want to + * map whole buffer + */ + vma->vm_pgoff = 0; + + ret = dma_mmap_coherent(buf->dev, vma, buf->vaddr, + buf->dma_addr, buf->size); + + if (ret) { + printk(KERN_ERR "Remapping memory failed, error: %d\n", ret); + return ret; + } + + vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; + vma->vm_private_data = &buf->handler; + vma->vm_ops = &vb2_common_vm_ops; + + vma->vm_ops->open(vma); + + printk(KERN_DEBUG "%s: mapped dma addr 0x%08lx at 0x%08lx, size %ld\n", + __func__, (unsigned long)buf->dma_addr, vma->vm_start, + buf->size); + + return 0; } /*********************************************/ -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:28 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:28 +0200 Subject: [Linaro-mm-sig] [PATCH 05/12] v4l: vb2-dma-contig: add support for DMABUF exporting In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-6-git-send-email-t.stanislaws@samsung.com> This patch adds support for exporting a dma-contig buffer using DMABUF interface. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-dma-contig.c | 119 ++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index ae656be..b5826e0 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -325,6 +325,124 @@ static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) } /*********************************************/ +/* DMABUF ops for exporters */ +/*********************************************/ + +struct vb2_dc_attachment { + struct sg_table sgt; + enum dma_data_direction dir; +}; + +static int vb2_dc_dmabuf_ops_attach(struct dma_buf *dbuf, struct device *dev, + struct dma_buf_attachment *dbuf_attach) +{ + /* nothing to be done */ + return 0; +} + +static void vb2_dc_dmabuf_ops_detach(struct dma_buf *dbuf, + struct dma_buf_attachment *db_attach) +{ + struct vb2_dc_attachment *attach = db_attach->priv; + struct sg_table *sgt; + + if (!attach) + return; + + sgt = &attach->sgt; + + dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->nents, attach->dir); + sg_free_table(sgt); + kfree(attach); + db_attach->priv = NULL; +} + +static struct sg_table *vb2_dc_dmabuf_ops_map( + struct dma_buf_attachment *db_attach, enum dma_data_direction dir) +{ + struct dma_buf *dbuf = db_attach->dmabuf; + struct vb2_dc_buf *buf = dbuf->priv; + struct vb2_dc_attachment *attach = db_attach->priv; + struct sg_table *sgt; + struct scatterlist *rd, *wr; + int i, ret; + + /* return previously mapped sg table */ + if (attach) + return &attach->sgt; + + attach = kzalloc(sizeof *attach, GFP_KERNEL); + if (!attach) + return ERR_PTR(-ENOMEM); + + sgt = &attach->sgt; + attach->dir = dir; + + /* copying the buf->base_sgt to attachment */ + ret = sg_alloc_table(sgt, buf->sgt_base->orig_nents, GFP_KERNEL); + if (ret) { + kfree(attach); + return ERR_PTR(-ENOMEM); + } + + rd = buf->sgt_base->sgl; + wr = sgt->sgl; + for (i = 0; i < sgt->orig_nents; ++i) { + sg_set_page(wr, sg_page(rd), rd->length, rd->offset); + rd = sg_next(rd); + wr = sg_next(wr); + } + + /* mapping new sglist to the client */ + ret = dma_map_sg(db_attach->dev, sgt->sgl, sgt->orig_nents, dir); + if (ret <= 0) { + printk(KERN_ERR "failed to map scatterlist\n"); + sg_free_table(sgt); + kfree(attach); + return ERR_PTR(-EIO); + } + + db_attach->priv = attach; + + return sgt; +} + +static void vb2_dc_dmabuf_ops_unmap(struct dma_buf_attachment *db_attach, + struct sg_table *sgt, enum dma_data_direction dir) +{ + /* nothing to be done here */ +} + +static void vb2_dc_dmabuf_ops_release(struct dma_buf *dbuf) +{ + /* drop reference obtained in vb2_dc_get_dmabuf */ + vb2_dc_put(dbuf->priv); +} + +static struct dma_buf_ops vb2_dc_dmabuf_ops = { + .attach = vb2_dc_dmabuf_ops_attach, + .detach = vb2_dc_dmabuf_ops_detach, + .map_dma_buf = vb2_dc_dmabuf_ops_map, + .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap, + .release = vb2_dc_dmabuf_ops_release, +}; + +static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv) +{ + struct vb2_dc_buf *buf = buf_priv; + struct dma_buf *dbuf; + + dbuf = dma_buf_export(buf, &vb2_dc_dmabuf_ops, buf->size, 0); + if (IS_ERR(dbuf)) + return NULL; + + /* dmabuf keeps reference to vb2 buffer */ + atomic_inc(&buf->refcount); + + return dbuf; +} + +/*********************************************/ /* callbacks for USERPTR buffers */ /*********************************************/ @@ -621,6 +739,7 @@ static void *vb2_dc_attach_dmabuf(void *alloc_ctx, struct dma_buf *dbuf, const struct vb2_mem_ops vb2_dma_contig_memops = { .alloc = vb2_dc_alloc, .put = vb2_dc_put, + .get_dmabuf = vb2_dc_get_dmabuf, .cookie = vb2_dc_cookie, .vaddr = vb2_dc_vaddr, .mmap = vb2_dc_mmap, -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:31 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:31 +0200 Subject: [Linaro-mm-sig] [PATCH 08/12] v4l: s5p-tv: mixer: support for dmabuf exporting In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-9-git-send-email-t.stanislaws@samsung.com> This patch enhances s5p-tv with support for DMABUF exporting via VIDIOC_EXPBUF ioctl. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/s5p-tv/mixer_video.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/media/video/s5p-tv/mixer_video.c b/drivers/media/video/s5p-tv/mixer_video.c index cff974a..d8def5b 100644 --- a/drivers/media/video/s5p-tv/mixer_video.c +++ b/drivers/media/video/s5p-tv/mixer_video.c @@ -697,6 +697,15 @@ static int mxr_dqbuf(struct file *file, void *priv, struct v4l2_buffer *p) return vb2_dqbuf(&layer->vb_queue, p, file->f_flags & O_NONBLOCK); } +static int mxr_expbuf(struct file *file, void *priv, + struct v4l2_exportbuffer *eb) +{ + struct mxr_layer *layer = video_drvdata(file); + + mxr_dbg(layer->mdev, "%s:%d\n", __func__, __LINE__); + return vb2_expbuf(&layer->vb_queue, eb); +} + static int mxr_streamon(struct file *file, void *priv, enum v4l2_buf_type i) { struct mxr_layer *layer = video_drvdata(file); @@ -724,6 +733,7 @@ static const struct v4l2_ioctl_ops mxr_ioctl_ops = { .vidioc_querybuf = mxr_querybuf, .vidioc_qbuf = mxr_qbuf, .vidioc_dqbuf = mxr_dqbuf, + .vidioc_expbuf = mxr_expbuf, /* Streaming control */ .vidioc_streamon = mxr_streamon, .vidioc_streamoff = mxr_streamoff, -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:25 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:25 +0200 Subject: [Linaro-mm-sig] [PATCH 02/12] v4l: add buffer exporting via dmabuf In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-3-git-send-email-t.stanislaws@samsung.com> This patch adds extension to V4L2 api. It allow to export a mmap buffer as file descriptor. New ioctl VIDIOC_EXPBUF is added. It takes a buffer offset used by mmap and return a file descriptor on success. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/v4l2-compat-ioctl32.c | 1 + drivers/media/video/v4l2-dev.c | 1 + drivers/media/video/v4l2-ioctl.c | 6 ++++++ include/linux/videodev2.h | 26 ++++++++++++++++++++++++++ include/media/v4l2-ioctl.h | 2 ++ 5 files changed, 36 insertions(+) diff --git a/drivers/media/video/v4l2-compat-ioctl32.c b/drivers/media/video/v4l2-compat-ioctl32.c index 5327ad3..45159d9 100644 --- a/drivers/media/video/v4l2-compat-ioctl32.c +++ b/drivers/media/video/v4l2-compat-ioctl32.c @@ -954,6 +954,7 @@ long v4l2_compat_ioctl32(struct file *file, unsigned int cmd, unsigned long arg) case VIDIOC_S_FBUF32: case VIDIOC_OVERLAY32: case VIDIOC_QBUF32: + case VIDIOC_EXPBUF: case VIDIOC_DQBUF32: case VIDIOC_STREAMON32: case VIDIOC_STREAMOFF32: diff --git a/drivers/media/video/v4l2-dev.c b/drivers/media/video/v4l2-dev.c index 5ccbd46..6bf6307 100644 --- a/drivers/media/video/v4l2-dev.c +++ b/drivers/media/video/v4l2-dev.c @@ -597,6 +597,7 @@ static void determine_valid_ioctls(struct video_device *vdev) SET_VALID_IOCTL(ops, VIDIOC_REQBUFS, vidioc_reqbufs); SET_VALID_IOCTL(ops, VIDIOC_QUERYBUF, vidioc_querybuf); SET_VALID_IOCTL(ops, VIDIOC_QBUF, vidioc_qbuf); + SET_VALID_IOCTL(ops, VIDIOC_EXPBUF, vidioc_expbuf); SET_VALID_IOCTL(ops, VIDIOC_DQBUF, vidioc_dqbuf); SET_VALID_IOCTL(ops, VIDIOC_OVERLAY, vidioc_overlay); SET_VALID_IOCTL(ops, VIDIOC_G_FBUF, vidioc_g_fbuf); diff --git a/drivers/media/video/v4l2-ioctl.c b/drivers/media/video/v4l2-ioctl.c index 31fc2ad..a73b14e 100644 --- a/drivers/media/video/v4l2-ioctl.c +++ b/drivers/media/video/v4l2-ioctl.c @@ -212,6 +212,7 @@ static struct v4l2_ioctl_info v4l2_ioctls[] = { IOCTL_INFO(VIDIOC_S_FBUF, INFO_FL_PRIO), IOCTL_INFO(VIDIOC_OVERLAY, INFO_FL_PRIO), IOCTL_INFO(VIDIOC_QBUF, 0), + IOCTL_INFO(VIDIOC_EXPBUF, 0), IOCTL_INFO(VIDIOC_DQBUF, 0), IOCTL_INFO(VIDIOC_STREAMON, INFO_FL_PRIO), IOCTL_INFO(VIDIOC_STREAMOFF, INFO_FL_PRIO), @@ -957,6 +958,11 @@ static long __video_do_ioctl(struct file *file, dbgbuf(cmd, vfd, p); break; } + case VIDIOC_EXPBUF: + { + ret = ops->vidioc_expbuf(file, fh, arg); + break; + } case VIDIOC_DQBUF: { struct v4l2_buffer *p = arg; diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 51b20f4..e8893a5 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h @@ -684,6 +684,31 @@ struct v4l2_buffer { #define V4L2_BUF_FLAG_NO_CACHE_INVALIDATE 0x0800 #define V4L2_BUF_FLAG_NO_CACHE_CLEAN 0x1000 +/** + * struct v4l2_exportbuffer - export of video buffer as DMABUF file descriptor + * + * @fd: file descriptor associated with DMABUF (set by driver) + * @mem_offset: buffer memory offset as returned by VIDIOC_QUERYBUF in struct + * v4l2_buffer::m.offset (for single-plane formats) or + * v4l2_plane::m.offset (for multi-planar formats) + * @flags: flags for newly created file, currently only O_CLOEXEC is + * supported, refer to manual of open syscall for more details + * + * Contains data used for exporting a video buffer as DMABUF file descriptor. + * The buffer is identified by a 'cookie' returned by VIDIOC_QUERYBUF + * (identical to the cookie used to mmap() the buffer to userspace). All + * reserved fields must be set to zero. The field reserved0 is expected to + * become a structure 'type' allowing an alternative layout of the structure + * content. Therefore this field should not be used for any other extensions. + */ +struct v4l2_exportbuffer { + __u32 fd; + __u32 reserved0; + __u32 mem_offset; + __u32 flags; + __u32 reserved[12]; +}; + /* * O V E R L A Y P R E V I E W */ @@ -2553,6 +2578,7 @@ struct v4l2_create_buffers { #define VIDIOC_S_FBUF _IOW('V', 11, struct v4l2_framebuffer) #define VIDIOC_OVERLAY _IOW('V', 14, int) #define VIDIOC_QBUF _IOWR('V', 15, struct v4l2_buffer) +#define VIDIOC_EXPBUF _IOWR('V', 16, struct v4l2_exportbuffer) #define VIDIOC_DQBUF _IOWR('V', 17, struct v4l2_buffer) #define VIDIOC_STREAMON _IOW('V', 18, int) #define VIDIOC_STREAMOFF _IOW('V', 19, int) diff --git a/include/media/v4l2-ioctl.h b/include/media/v4l2-ioctl.h index d8b76f7..ccd1faa 100644 --- a/include/media/v4l2-ioctl.h +++ b/include/media/v4l2-ioctl.h @@ -119,6 +119,8 @@ struct v4l2_ioctl_ops { int (*vidioc_reqbufs) (struct file *file, void *fh, struct v4l2_requestbuffers *b); int (*vidioc_querybuf)(struct file *file, void *fh, struct v4l2_buffer *b); int (*vidioc_qbuf) (struct file *file, void *fh, struct v4l2_buffer *b); + int (*vidioc_expbuf) (struct file *file, void *fh, + struct v4l2_exportbuffer *e); int (*vidioc_dqbuf) (struct file *file, void *fh, struct v4l2_buffer *b); int (*vidioc_create_bufs)(struct file *file, void *fh, struct v4l2_create_buffers *b); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:26 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:26 +0200 Subject: [Linaro-mm-sig] [PATCH 03/12] v4l: vb2: add buffer exporting via dmabuf In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-4-git-send-email-t.stanislaws@samsung.com> This patch adds extension to videobuf2-core. It allow to export a mmap buffer as a file descriptor. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-core.c | 67 ++++++++++++++++++++++++++++++++++ include/media/videobuf2-core.h | 2 + 2 files changed, 69 insertions(+) diff --git a/drivers/media/video/videobuf2-core.c b/drivers/media/video/videobuf2-core.c index d60ed25..923165a 100644 --- a/drivers/media/video/videobuf2-core.c +++ b/drivers/media/video/videobuf2-core.c @@ -1730,6 +1730,73 @@ static int __find_plane_by_offset(struct vb2_queue *q, unsigned long off, } /** + * vb2_expbuf() - Export a buffer as a file descriptor + * @q: videobuf2 queue + * @eb: export buffer structure passed from userspace to vidioc_expbuf + * handler in driver + * + * The return values from this function are intended to be directly returned + * from vidioc_expbuf handler in driver. + */ +int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb) +{ + struct vb2_buffer *vb = NULL; + struct vb2_plane *vb_plane; + unsigned int buffer, plane; + int ret; + struct dma_buf *dbuf; + + if (q->memory != V4L2_MEMORY_MMAP) { + dprintk(1, "Queue is not currently set up for mmap\n"); + return -EINVAL; + } + + if (!q->mem_ops->get_dmabuf) { + dprintk(1, "Queue does not support DMA buffer exporting\n"); + return -EINVAL; + } + + if (eb->flags & ~O_CLOEXEC) { + dprintk(1, "Queue does support only O_CLOEXEC flag\n"); + return -EINVAL; + } + + /* + * Find the plane corresponding to the offset passed by userspace. + */ + ret = __find_plane_by_offset(q, eb->mem_offset, &buffer, &plane); + if (ret) { + dprintk(1, "invalid offset %u\n", eb->mem_offset); + return ret; + } + + vb = q->bufs[buffer]; + vb_plane = &vb->planes[plane]; + + dbuf = call_memop(q, get_dmabuf, vb_plane->mem_priv); + if (IS_ERR_OR_NULL(dbuf)) { + dprintk(1, "Failed to export buffer %d, plane %d\n", + buffer, plane); + return -EINVAL; + } + + ret = dma_buf_fd(dbuf, eb->flags); + if (ret < 0) { + dprintk(3, "buffer %d, plane %d failed to export (%d)\n", + buffer, plane, ret); + dma_buf_put(dbuf); + return ret; + } + + dprintk(3, "buffer %d, plane %d exported as %d descriptor\n", + buffer, plane, ret); + eb->fd = ret; + + return 0; +} +EXPORT_SYMBOL_GPL(vb2_expbuf); + +/** * vb2_mmap() - map video buffers into application address space * @q: videobuf2 queue * @vma: vma passed to the mmap file operation handler in the driver diff --git a/include/media/videobuf2-core.h b/include/media/videobuf2-core.h index d079f92..fe01f95 100644 --- a/include/media/videobuf2-core.h +++ b/include/media/videobuf2-core.h @@ -81,6 +81,7 @@ struct vb2_fileio_data; struct vb2_mem_ops { void *(*alloc)(void *alloc_ctx, unsigned long size); void (*put)(void *buf_priv); + struct dma_buf *(*get_dmabuf)(void *buf_priv); void *(*get_userptr)(void *alloc_ctx, unsigned long vaddr, unsigned long size, int write); @@ -350,6 +351,7 @@ int vb2_queue_init(struct vb2_queue *q); void vb2_queue_release(struct vb2_queue *q); int vb2_qbuf(struct vb2_queue *q, struct v4l2_buffer *b); +int vb2_expbuf(struct vb2_queue *q, struct v4l2_exportbuffer *eb); int vb2_dqbuf(struct vb2_queue *q, struct v4l2_buffer *b, bool nonblocking); int vb2_streamon(struct vb2_queue *q, enum v4l2_buf_type type); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:30 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:30 +0200 Subject: [Linaro-mm-sig] [PATCH 07/12] v4l: s5p-fimc: support for dmabuf exporting In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-8-git-send-email-t.stanislaws@samsung.com> This patch enhances s5p-fimc with support for DMABUF exporting via VIDIOC_EXPBUF ioctl. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/s5p-fimc/fimc-capture.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/media/video/s5p-fimc/fimc-capture.c b/drivers/media/video/s5p-fimc/fimc-capture.c index cd27e33..52c9b36 100644 --- a/drivers/media/video/s5p-fimc/fimc-capture.c +++ b/drivers/media/video/s5p-fimc/fimc-capture.c @@ -1101,6 +1101,14 @@ static int fimc_cap_qbuf(struct file *file, void *priv, return vb2_qbuf(&fimc->vid_cap.vbq, buf); } +static int fimc_cap_expbuf(struct file *file, void *priv, + struct v4l2_exportbuffer *eb) +{ + struct fimc_dev *fimc = video_drvdata(file); + + return vb2_expbuf(&fimc->vid_cap.vbq, eb); +} + static int fimc_cap_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf) { @@ -1225,6 +1233,7 @@ static const struct v4l2_ioctl_ops fimc_capture_ioctl_ops = { .vidioc_qbuf = fimc_cap_qbuf, .vidioc_dqbuf = fimc_cap_dqbuf, + .vidioc_expbuf = fimc_cap_expbuf, .vidioc_prepare_buf = fimc_cap_prepare_buf, .vidioc_create_bufs = fimc_cap_create_bufs, -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:32 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:32 +0200 Subject: [Linaro-mm-sig] [PATCH 09/12] v4l: s5p-mfc: support for dmabuf exporting In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-10-git-send-email-t.stanislaws@samsung.com> This patch enhances s5p-mfc with support for DMABUF exporting via VIDIOC_EXPBUF ioctl. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park CC: Kamil Debski --- drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 13 +++++++++++++ drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 13 +++++++++++++ 2 files changed, 26 insertions(+) diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c index c25ec02..e1ebc76 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_dec.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc_dec.c @@ -564,6 +564,18 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf) return -EINVAL; } +/* Export DMA buffer */ +static int vidioc_expbuf(struct file *file, void *priv, + struct v4l2_exportbuffer *eb) +{ + struct s5p_mfc_ctx *ctx = fh_to_ctx(priv); + + if (eb->mem_offset < DST_QUEUE_OFF_BASE) + return vb2_expbuf(&ctx->vq_src, eb); + else + return vb2_expbuf(&ctx->vq_dst, eb); +} + /* Stream on */ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type type) @@ -739,6 +751,7 @@ static const struct v4l2_ioctl_ops s5p_mfc_dec_ioctl_ops = { .vidioc_querybuf = vidioc_querybuf, .vidioc_qbuf = vidioc_qbuf, .vidioc_dqbuf = vidioc_dqbuf, + .vidioc_expbuf = vidioc_expbuf, .vidioc_streamon = vidioc_streamon, .vidioc_streamoff = vidioc_streamoff, .vidioc_g_crop = vidioc_g_crop, diff --git a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c index acedb20..887f1aa 100644 --- a/drivers/media/video/s5p-mfc/s5p_mfc_enc.c +++ b/drivers/media/video/s5p-mfc/s5p_mfc_enc.c @@ -1141,6 +1141,18 @@ static int vidioc_dqbuf(struct file *file, void *priv, struct v4l2_buffer *buf) return -EINVAL; } +/* Export DMA buffer */ +static int vidioc_expbuf(struct file *file, void *priv, + struct v4l2_exportbuffer *eb) +{ + struct s5p_mfc_ctx *ctx = fh_to_ctx(priv); + + if (eb->mem_offset < DST_QUEUE_OFF_BASE) + return vb2_expbuf(&ctx->vq_src, eb); + else + return vb2_expbuf(&ctx->vq_dst, eb); +} + /* Stream on */ static int vidioc_streamon(struct file *file, void *priv, enum v4l2_buf_type type) @@ -1486,6 +1498,7 @@ static const struct v4l2_ioctl_ops s5p_mfc_enc_ioctl_ops = { .vidioc_querybuf = vidioc_querybuf, .vidioc_qbuf = vidioc_qbuf, .vidioc_dqbuf = vidioc_dqbuf, + .vidioc_expbuf = vidioc_expbuf, .vidioc_streamon = vidioc_streamon, .vidioc_streamoff = vidioc_streamoff, .vidioc_s_parm = vidioc_s_parm, -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:34 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:34 +0200 Subject: [Linaro-mm-sig] [PATCH 11/12] v4l: vb2-dma-contig: use sg_alloc_table_from_pages function In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-12-git-send-email-t.stanislaws@samsung.com> This patch makes use of sg_alloc_table_from_pages to simplify handling of sg tables. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-dma-contig.c | 90 ++++++++-------------------- 1 file changed, 25 insertions(+), 65 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 59ee81c..b5caf1d 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -32,7 +32,7 @@ struct vb2_dc_buf { /* MMAP related */ struct vb2_vmarea_handler handler; atomic_t refcount; - struct sg_table *sgt_base; + struct sg_table sgt_base; /* USERPTR related */ struct vm_area_struct *vma; @@ -45,57 +45,6 @@ struct vb2_dc_buf { /* scatterlist table functions */ /*********************************************/ -static struct sg_table *vb2_dc_pages_to_sgt(struct page **pages, - unsigned int n_pages, unsigned long offset, unsigned long size) -{ - struct sg_table *sgt; - unsigned int chunks; - unsigned int i; - unsigned int cur_page; - int ret; - struct scatterlist *s; - - sgt = kzalloc(sizeof *sgt, GFP_KERNEL); - if (!sgt) - return ERR_PTR(-ENOMEM); - - /* compute number of chunks */ - chunks = 1; - for (i = 1; i < n_pages; ++i) - if (pages[i] != pages[i - 1] + 1) - ++chunks; - - ret = sg_alloc_table(sgt, chunks, GFP_KERNEL); - if (ret) { - kfree(sgt); - return ERR_PTR(-ENOMEM); - } - - /* merging chunks and putting them into the scatterlist */ - cur_page = 0; - for_each_sg(sgt->sgl, s, sgt->orig_nents, i) { - unsigned long chunk_size; - unsigned int j; - - for (j = cur_page + 1; j < n_pages; ++j) - if (pages[j] != pages[j - 1] + 1) - break; - - chunk_size = ((j - cur_page) << PAGE_SHIFT) - offset; - sg_set_page(s, pages[cur_page], min(size, chunk_size), offset); - size -= chunk_size; - offset = 0; - cur_page = j; - } - - return sgt; -} - -static void vb2_dc_release_sgtable(struct sg_table *sgt) -{ - sg_free_table(sgt); - kfree(sgt); -} static void vb2_dc_sgt_foreach_page(struct sg_table *sgt, void (*cb)(struct page *pg)) @@ -190,7 +139,7 @@ static void vb2_dc_put(void *buf_priv) if (!atomic_dec_and_test(&buf->refcount)) return; - vb2_dc_release_sgtable(buf->sgt_base); + sg_free_table(&buf->sgt_base); dma_free_coherent(buf->dev, buf->size, buf->vaddr, buf->dma_addr); kfree(buf); } @@ -254,9 +203,9 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) goto fail_pages; } - buf->sgt_base = vb2_dc_pages_to_sgt(pages, n_pages, 0, size); - if (IS_ERR(buf->sgt_base)) { - ret = PTR_ERR(buf->sgt_base); + ret = sg_alloc_table_from_pages(&buf->sgt_base, + pages, n_pages, 0, size, GFP_KERNEL); + if (ret) { dev_err(dev, "failed to prepare sg table\n"); goto fail_pages; } @@ -379,13 +328,13 @@ static struct sg_table *vb2_dc_dmabuf_ops_map( attach->dir = dir; /* copying the buf->base_sgt to attachment */ - ret = sg_alloc_table(sgt, buf->sgt_base->orig_nents, GFP_KERNEL); + ret = sg_alloc_table(sgt, buf->sgt_base.orig_nents, GFP_KERNEL); if (ret) { kfree(attach); return ERR_PTR(-ENOMEM); } - rd = buf->sgt_base->sgl; + rd = buf->sgt_base.sgl; wr = sgt->sgl; for (i = 0; i < sgt->orig_nents; ++i) { sg_set_page(wr, sg_page(rd), rd->length, rd->offset); @@ -519,7 +468,8 @@ static void vb2_dc_put_userptr(void *buf_priv) if (!vma_is_io(buf->vma)) vb2_dc_sgt_foreach_page(sgt, vb2_dc_put_dirty_page); - vb2_dc_release_sgtable(sgt); + sg_free_table(sgt); + kfree(sgt); vb2_put_vma(buf->vma); kfree(buf); } @@ -586,13 +536,20 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, goto fail_vma; } - sgt = vb2_dc_pages_to_sgt(pages, n_pages, offset, size); - if (IS_ERR(sgt)) { - printk(KERN_ERR "failed to create scatterlist table\n"); + sgt = kzalloc(sizeof *sgt, GFP_KERNEL); + if (!sgt) { + printk(KERN_ERR "failed to allocate sg table\n"); ret = -ENOMEM; goto fail_get_user_pages; } + ret = sg_alloc_table_from_pages(sgt, pages, n_pages, + offset, size, GFP_KERNEL); + if (ret) { + printk(KERN_ERR "failed to initialize sg table\n"); + goto fail_sgt; + } + /* pages are no longer needed */ kfree(pages); pages = NULL; @@ -602,7 +559,7 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, if (sgt->nents <= 0) { printk(KERN_ERR "failed to map scatterlist\n"); ret = -EIO; - goto fail_sgt; + goto fail_sgt_init; } contig_size = vb2_dc_get_contiguous_size(sgt); @@ -622,10 +579,13 @@ static void *vb2_dc_get_userptr(void *alloc_ctx, unsigned long vaddr, fail_map_sg: dma_unmap_sg(buf->dev, sgt->sgl, sgt->nents, buf->dma_dir); -fail_sgt: +fail_sgt_init: if (!vma_is_io(buf->vma)) vb2_dc_sgt_foreach_page(sgt, put_page); - vb2_dc_release_sgtable(sgt); + sg_free_table(sgt); + +fail_sgt: + kfree(sgt); fail_get_user_pages: if (pages && !vma_is_io(buf->vma)) -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:27 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:27 +0200 Subject: [Linaro-mm-sig] [PATCH 04/12] v4l: vb2-dma-contig: add setup of sglist for MMAP buffers In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-5-git-send-email-t.stanislaws@samsung.com> This patch adds the setup of sglist list for MMAP buffers. It is needed for buffer exporting via DMABUF mechanism. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-dma-contig.c | 70 +++++++++++++++++++++++++++- 1 file changed, 68 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index 52b4f59..ae656be 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -32,6 +32,7 @@ struct vb2_dc_buf { /* MMAP related */ struct vb2_vmarea_handler handler; atomic_t refcount; + struct sg_table *sgt_base; /* USERPTR related */ struct vm_area_struct *vma; @@ -189,14 +190,37 @@ static void vb2_dc_put(void *buf_priv) if (!atomic_dec_and_test(&buf->refcount)) return; + vb2_dc_release_sgtable(buf->sgt_base); dma_free_coherent(buf->dev, buf->size, buf->vaddr, buf->dma_addr); kfree(buf); } +static int vb2_dc_kaddr_to_pages(unsigned long kaddr, + struct page **pages, unsigned int n_pages) +{ + unsigned int i; + unsigned long pfn; + struct vm_area_struct vma = { + .vm_flags = VM_IO | VM_PFNMAP, + .vm_mm = current->mm, + }; + + for (i = 0; i < n_pages; ++i, kaddr += PAGE_SIZE) { + if (follow_pfn(&vma, kaddr, &pfn)) + break; + pages[i] = pfn_to_page(pfn); + } + + return i; +} + static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) { struct device *dev = alloc_ctx; struct vb2_dc_buf *buf; + int ret = -ENOMEM; + int n_pages; + struct page **pages = NULL; buf = kzalloc(sizeof *buf, GFP_KERNEL); if (!buf) @@ -205,10 +229,41 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) buf->vaddr = dma_alloc_coherent(dev, size, &buf->dma_addr, GFP_KERNEL); if (!buf->vaddr) { dev_err(dev, "dma_alloc_coherent of size %ld failed\n", size); - kfree(buf); - return ERR_PTR(-ENOMEM); + goto fail_buf; + } + + WARN_ON((unsigned long)buf->vaddr & ~PAGE_MASK); + WARN_ON(buf->dma_addr & ~PAGE_MASK); + + n_pages = PAGE_ALIGN(size) >> PAGE_SHIFT; + + pages = kmalloc(n_pages * sizeof pages[0], GFP_KERNEL); + if (!pages) { + dev_err(dev, "failed to alloc page table\n"); + goto fail_dma; + } + + ret = vb2_dc_kaddr_to_pages((unsigned long)buf->vaddr, pages, n_pages); + if (ret < 0) { + dev_err(dev, "failed to get buffer pages from DMA API\n"); + goto fail_pages; + } + if (ret != n_pages) { + ret = -EFAULT; + dev_err(dev, "failed to get all pages from DMA API\n"); + goto fail_pages; + } + + buf->sgt_base = vb2_dc_pages_to_sgt(pages, n_pages, 0, size); + if (IS_ERR(buf->sgt_base)) { + ret = PTR_ERR(buf->sgt_base); + dev_err(dev, "failed to prepare sg table\n"); + goto fail_pages; } + /* pages are no longer needed */ + kfree(pages); + buf->dev = dev; buf->size = size; @@ -219,6 +274,17 @@ static void *vb2_dc_alloc(void *alloc_ctx, unsigned long size) atomic_inc(&buf->refcount); return buf; + +fail_pages: + kfree(pages); + +fail_dma: + dma_free_coherent(dev, size, buf->vaddr, buf->dma_addr); + +fail_buf: + kfree(buf); + + return ERR_PTR(ret); } static int vb2_dc_mmap(void *buf_priv, struct vm_area_struct *vma) -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:29 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:29 +0200 Subject: [Linaro-mm-sig] [PATCH 06/12] v4l: vb2-dma-contig: add vmap/kmap for dmabuf exporting In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-7-git-send-email-t.stanislaws@samsung.com> This patch adds support for vmap and kmap callbacks for DMABUF exporter. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-dma-contig.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index b5826e0..59ee81c 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -419,11 +419,28 @@ static void vb2_dc_dmabuf_ops_release(struct dma_buf *dbuf) vb2_dc_put(dbuf->priv); } +static void *vb2_dc_dmabuf_ops_kmap(struct dma_buf *dbuf, unsigned long pgnum) +{ + struct vb2_dc_buf *buf = dbuf->priv; + + return buf->vaddr + pgnum * PAGE_SIZE; +} + +static void *vb2_dc_dmabuf_ops_vmap(struct dma_buf *dbuf) +{ + struct vb2_dc_buf *buf = dbuf->priv; + + return buf->vaddr; +} + static struct dma_buf_ops vb2_dc_dmabuf_ops = { .attach = vb2_dc_dmabuf_ops_attach, .detach = vb2_dc_dmabuf_ops_detach, .map_dma_buf = vb2_dc_dmabuf_ops_map, .unmap_dma_buf = vb2_dc_dmabuf_ops_unmap, + .kmap = vb2_dc_dmabuf_ops_kmap, + .kmap_atomic = vb2_dc_dmabuf_ops_kmap, + .vmap = vb2_dc_dmabuf_ops_vmap, .release = vb2_dc_dmabuf_ops_release, }; -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:33 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:33 +0200 Subject: [Linaro-mm-sig] [PATCH 10/12] v4l: vb2: remove vb2_mmap_pfn_range function In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-11-git-send-email-t.stanislaws@samsung.com> This patch removes vb2_mmap_pfn_range from videobuf2 helpers. The function is no longer used in vb2 code. Suggested-by: Laurent Pinchart Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-memops.c | 40 -------------------------------- include/media/videobuf2-memops.h | 5 ---- 2 files changed, 45 deletions(-) diff --git a/drivers/media/video/videobuf2-memops.c b/drivers/media/video/videobuf2-memops.c index 504cd4c..81c1ad8 100644 --- a/drivers/media/video/videobuf2-memops.c +++ b/drivers/media/video/videobuf2-memops.c @@ -137,46 +137,6 @@ int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size, EXPORT_SYMBOL_GPL(vb2_get_contig_userptr); /** - * vb2_mmap_pfn_range() - map physical pages to userspace - * @vma: virtual memory region for the mapping - * @paddr: starting physical address of the memory to be mapped - * @size: size of the memory to be mapped - * @vm_ops: vm operations to be assigned to the created area - * @priv: private data to be associated with the area - * - * Returns 0 on success. - */ -int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, - unsigned long size, - const struct vm_operations_struct *vm_ops, - void *priv) -{ - int ret; - - size = min_t(unsigned long, vma->vm_end - vma->vm_start, size); - - vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); - ret = remap_pfn_range(vma, vma->vm_start, paddr >> PAGE_SHIFT, - size, vma->vm_page_prot); - if (ret) { - printk(KERN_ERR "Remapping memory failed, error: %d\n", ret); - return ret; - } - - vma->vm_flags |= VM_DONTEXPAND | VM_RESERVED; - vma->vm_private_data = priv; - vma->vm_ops = vm_ops; - - vma->vm_ops->open(vma); - - pr_debug("%s: mapped paddr 0x%08lx at 0x%08lx, size %ld\n", - __func__, paddr, vma->vm_start, size); - - return 0; -} -EXPORT_SYMBOL_GPL(vb2_mmap_pfn_range); - -/** * vb2_common_vm_open() - increase refcount of the vma * @vma: virtual memory region for the mapping * diff --git a/include/media/videobuf2-memops.h b/include/media/videobuf2-memops.h index 84e1f6c..f05444c 100644 --- a/include/media/videobuf2-memops.h +++ b/include/media/videobuf2-memops.h @@ -33,11 +33,6 @@ extern const struct vm_operations_struct vb2_common_vm_ops; int vb2_get_contig_userptr(unsigned long vaddr, unsigned long size, struct vm_area_struct **res_vma, dma_addr_t *res_pa); -int vb2_mmap_pfn_range(struct vm_area_struct *vma, unsigned long paddr, - unsigned long size, - const struct vm_operations_struct *vm_ops, - void *priv); - struct vm_area_struct *vb2_get_vma(struct vm_area_struct *vma); void vb2_put_vma(struct vm_area_struct *vma); -- 1.7.9.5 From t.stanislaws at samsung.com Wed May 23 13:07:35 2012 From: t.stanislaws at samsung.com (Tomasz Stanislawski) Date: Wed, 23 May 2012 15:07:35 +0200 Subject: [Linaro-mm-sig] [PATCH 12/12] v4l: vb2-dma-contig: Move allocation of dbuf attachment to attach cb In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <1337778455-27912-13-git-send-email-t.stanislaws@samsung.com> The allocation of dma_buf_attachment is moved to attach callback. The initialization is left in map callback. Signed-off-by: Tomasz Stanislawski Signed-off-by: Kyungmin Park --- drivers/media/video/videobuf2-dma-contig.c | 39 ++++++++++++++++++---------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/drivers/media/video/videobuf2-dma-contig.c b/drivers/media/video/videobuf2-dma-contig.c index b5caf1d..3bf7c45 100644 --- a/drivers/media/video/videobuf2-dma-contig.c +++ b/drivers/media/video/videobuf2-dma-contig.c @@ -285,7 +285,15 @@ struct vb2_dc_attachment { static int vb2_dc_dmabuf_ops_attach(struct dma_buf *dbuf, struct device *dev, struct dma_buf_attachment *dbuf_attach) { - /* nothing to be done */ + struct vb2_dc_attachment *attach; + + attach = kzalloc(sizeof *attach, GFP_KERNEL); + if (!attach) + return -ENOMEM; + + attach->dir = DMA_NONE; + dbuf_attach->priv = attach; + return 0; } @@ -300,7 +308,9 @@ static void vb2_dc_dmabuf_ops_detach(struct dma_buf *dbuf, sgt = &attach->sgt; - dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->nents, attach->dir); + /* checking if scaterlist was ever mapped */ + if (attach->dir != DMA_NONE) + dma_unmap_sg(db_attach->dev, sgt->sgl, sgt->nents, attach->dir); sg_free_table(sgt); kfree(attach); db_attach->priv = NULL; @@ -314,25 +324,28 @@ static struct sg_table *vb2_dc_dmabuf_ops_map( struct vb2_dc_attachment *attach = db_attach->priv; struct sg_table *sgt; struct scatterlist *rd, *wr; - int i, ret; + int ret; + unsigned int i; + + if (WARN_ON(dir == DMA_NONE)) + return ERR_PTR(-EINVAL); /* return previously mapped sg table */ - if (attach) + if (attach->dir == dir) return &attach->sgt; - attach = kzalloc(sizeof *attach, GFP_KERNEL); - if (!attach) - return ERR_PTR(-ENOMEM); + /* reattaching is not allowed */ + if (WARN_ON(attach->dir != DMA_NONE)) + return ERR_PTR(-EBUSY); sgt = &attach->sgt; - attach->dir = dir; - /* copying the buf->base_sgt to attachment */ + /* Copy the buf->base_sgt scatter list to the attachment, as we can't + * map the same scatter list to multiple attachments at the same time. + */ ret = sg_alloc_table(sgt, buf->sgt_base.orig_nents, GFP_KERNEL); - if (ret) { - kfree(attach); + if (ret) return ERR_PTR(-ENOMEM); - } rd = buf->sgt_base.sgl; wr = sgt->sgl; @@ -347,10 +360,10 @@ static struct sg_table *vb2_dc_dmabuf_ops_map( if (ret <= 0) { printk(KERN_ERR "failed to map scatterlist\n"); sg_free_table(sgt); - kfree(attach); return ERR_PTR(-EIO); } + attach->dir = dir; db_attach->priv = attach; return sgt; -- 1.7.9.5 From sangwook.lee at linaro.org Wed May 23 14:01:10 2012 From: sangwook.lee at linaro.org (Sangwook Lee) Date: Wed, 23 May 2012 15:01:10 +0100 Subject: [Linaro-mm-sig] [PATCH 00/12] Support for dmabuf exporting for videobuf2 In-Reply-To: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> References: <1337778455-27912-1-git-send-email-t.stanislaws@samsung.com> Message-ID: Hi Tomasz On 23 May 2012 14:07, Tomasz Stanislawski wrote: > Hello everyone, > The patches adds support for DMABUF exporting to V4L2 stack. The latest > support for DMABUF importing was posted in [1]. The exporter part is > dependant > on DMA mapping redesign [2] which is not merged into the mainline. > Therefore it > is posted as a separate patchset. Moreover some patches depends on vmap > extension for DMABUF by Dave Airlie [3] and sg_alloc_table_from_pages > function > [4]. > Do you have your own git ? Thanks Sangwook > Changelog: > v0: (RFC) > - updated setup of VIDIOC_EXPBUF ioctl > - doc updates > - introduced workaround to avoid using dma_get_pages, > - removed caching of exported dmabuf to avoid existence of circular > reference > between dmabuf and vb2_dc_buf or resource leakage > - removed all 'change behaviour' patches > - inital support for exporting in s5p-mfs driver > - removal of vb2_mmap_pfn_range that is no longer used > - use sg_alloc_table_from_pages instead of creating sglist in vb2_dc code > - move attachment allocation to exporter's attach callback > > [1] > http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/48730 > [2] http://thread.gmane.org/gmane.linux.kernel.cross-arch/14098 > [3] http://permalink.gmane.org/gmane.comp.video.dri.devel/69302 > [4] This patchset is rebased on 3.4-rc1 plus the following patchsets: > > Marek Szyprowski (1): > v4l: vb2-dma-contig: let mmap method to use dma_mmap_coherent call > > Tomasz Stanislawski (11): > v4l: add buffer exporting via dmabuf > v4l: vb2: add buffer exporting via dmabuf > v4l: vb2-dma-contig: add setup of sglist for MMAP buffers > v4l: vb2-dma-contig: add support for DMABUF exporting > v4l: vb2-dma-contig: add vmap/kmap for dmabuf exporting > v4l: s5p-fimc: support for dmabuf exporting > v4l: s5p-tv: mixer: support for dmabuf exporting > v4l: s5p-mfc: support for dmabuf exporting > v4l: vb2: remove vb2_mmap_pfn_range function > v4l: vb2-dma-contig: use sg_alloc_table_from_pages function > v4l: vb2-dma-contig: Move allocation of dbuf attachment to attach cb > > drivers/media/video/s5p-fimc/fimc-capture.c | 9 + > drivers/media/video/s5p-mfc/s5p_mfc_dec.c | 13 ++ > drivers/media/video/s5p-mfc/s5p_mfc_enc.c | 13 ++ > drivers/media/video/s5p-tv/mixer_video.c | 10 + > drivers/media/video/v4l2-compat-ioctl32.c | 1 + > drivers/media/video/v4l2-dev.c | 1 + > drivers/media/video/v4l2-ioctl.c | 6 + > drivers/media/video/videobuf2-core.c | 67 ++++++ > drivers/media/video/videobuf2-dma-contig.c | 323 > ++++++++++++++++++++++----- > drivers/media/video/videobuf2-memops.c | 40 ---- > include/linux/videodev2.h | 26 +++ > include/media/v4l2-ioctl.h | 2 + > include/media/videobuf2-core.h | 2 + > include/media/videobuf2-memops.h | 5 - > 14 files changed, 411 insertions(+), 107 deletions(-) > > -- > 1.7.9.5 > > > _______________________________________________ > Linaro-mm-sig mailing list > Linaro-mm-sig at lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-mm-sig > -------------- next part -------------- An HTML attachment was scrubbed... URL: From m.szyprowski at samsung.com Thu May 24 12:26:12 2012 From: m.szyprowski at samsung.com (Marek Szyprowski) Date: Thu, 24 May 2012 14:26:12 +0200 Subject: [Linaro-mm-sig] [PATCHv2 3/4] mm: vmalloc: add VM_DMA flag to indicate areas used by dma-mapping framework In-Reply-To: <4FBB3B41.8010102@kernel.org> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-4-git-send-email-m.szyprowski@samsung.com> <4FBB3B41.8010102@kernel.org> Message-ID: <01e501cd39a8$67f34ea0$37d9ebe0$%szyprowski@samsung.com> Hi Minchan, On Tuesday, May 22, 2012 9:08 AM Minchan Kim wrote: > On 05/17/2012 07:54 PM, Marek Szyprowski wrote: > > > Add new type of vm_area intented to be used for consisten mappings > > created by dma-mapping framework. > > > > Signed-off-by: Marek Szyprowski > > Reviewed-by: Kyungmin Park > > --- > > include/linux/vmalloc.h | 1 + > > mm/vmalloc.c | 3 +++ > > 2 files changed, 4 insertions(+) > > > > diff --git a/include/linux/vmalloc.h b/include/linux/vmalloc.h > > index 6071e91..8a9555a 100644 > > --- a/include/linux/vmalloc.h > > +++ b/include/linux/vmalloc.h > > @@ -14,6 +14,7 @@ struct vm_area_struct; /* vma defining user mapping in > mm_types.h */ > > #define VM_USERMAP 0x00000008 /* suitable for remap_vmalloc_range */ > > #define VM_VPAGES 0x00000010 /* buffer for pages was vmalloc'ed */ > > #define VM_UNLIST 0x00000020 /* vm_struct is not listed in vmlist */ > > +#define VM_DMA 0x00000040 /* used by dma-mapping framework */ > > /* bits [20..32] reserved for arch specific ioremap internals */ > > > > > > /* > > diff --git a/mm/vmalloc.c b/mm/vmalloc.c > > index 8cb7f22..9c13bab 100644 > > --- a/mm/vmalloc.c > > +++ b/mm/vmalloc.c > > @@ -2582,6 +2582,9 @@ static int s_show(struct seq_file *m, void *p) > > if (v->flags & VM_IOREMAP) > > seq_printf(m, " ioremap"); > > > > + if (v->flags & VM_DMA) > > + seq_printf(m, " dma"); > > + > > Hmm, VM_DMA would become generic flag? > AFAIU, maybe VM_DMA would be used only on ARM arch. Right now yes, it will be used only on ARM architecture, but maybe other architecture will start using it once it is available. > Of course, it isn't performance sensitive part but there in no reason to check it, either > in other architecture except ARM. > > I suggest following as > > #ifdef CONFIG_ARM > #define VM_DMA 0x00000040 > #else > #define VM_DMA 0x0 > #end > > Maybe it could remove check code at compile time. I've been told to avoid such #ifdef construction if there is no really good reason for it. The only justification was significant impact on the performance, otherwise it would be just a good example of typical over-engineering. > > if (v->flags & VM_ALLOC) > > seq_printf(m, " vmalloc"); Best regards -- Marek Szyprowski Samsung Poland R&D Center From lethal at linux-sh.org Thu May 24 12:28:54 2012 From: lethal at linux-sh.org (Paul Mundt) Date: Thu, 24 May 2012 21:28:54 +0900 Subject: [Linaro-mm-sig] [PATCHv2 3/4] mm: vmalloc: add VM_DMA flag to indicate areas used by dma-mapping framework In-Reply-To: <01e501cd39a8$67f34ea0$37d9ebe0$%szyprowski@samsung.com> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-4-git-send-email-m.szyprowski@samsung.com> <4FBB3B41.8010102@kernel.org> <01e501cd39a8$67f34ea0$37d9ebe0$%szyprowski@samsung.com> Message-ID: <20120524122854.GD11860@linux-sh.org> On Thu, May 24, 2012 at 02:26:12PM +0200, Marek Szyprowski wrote: > On Tuesday, May 22, 2012 9:08 AM Minchan Kim wrote: > > Hmm, VM_DMA would become generic flag? > > AFAIU, maybe VM_DMA would be used only on ARM arch. > > Right now yes, it will be used only on ARM architecture, but maybe other architecture will > start using it once it is available. > There's very little about the code in question that is ARM-specific to begin with. I plan to adopt similar changes on SH once the work has settled one way or the other, so we'll probably use the VMA flag there, too. From tom.cooksey at arm.com Thu May 24 16:21:48 2012 From: tom.cooksey at arm.com (Tom Cooksey) Date: Thu, 24 May 2012 17:21:48 +0100 Subject: [Linaro-mm-sig] New "xf86-video-armsoc" DDX driver In-Reply-To: <20120521090328.GA4970@phenom.ffwll.local> References: <4fba0034.e1d9440a.7f33.0bfeSMTPIN_ADDED@mx.google.com> <20120521090328.GA4970@phenom.ffwll.local> Message-ID: <000101cd39c9$51cf6b10$f56e4130$@cooksey@arm.com> > -----Original Message----- > From: Daniel Vetter [mailto:daniel.vetter at ffwll.ch] On Behalf Of Daniel > Vetter > Sent: 21 May 2012 10:04 > To: Dave Airlie > Cc: Tom Cooksey; linaro-mm-sig at lists.linaro.org; xorg- > devel at lists.x.org; dri-devel at lists.freedesktop.org > Subject: Re: [Linaro-mm-sig] New "xf86-video-armsoc" DDX driver > > On Mon, May 21, 2012 at 09:55:06AM +0100, Dave Airlie wrote: > > > * Define a new x-server sub-module interface to allow a seperate > > > > .so 2D driver to be loaded (this is the approach the current > > > > OMAP DDX uses). > > > > This seems the sanest. > > Or go the intel glamour route and stitch together a somewhat generic 2d > accel code on top of GL. That should give you reasonable (albeit likely > not stellar) X render performance. > -Daniel I'm not sure that would perform well on a tile-based deferred renderer like Mali. To perform well, we need to gather an entire frame's worth of rendering/draw-calls before passing them to the GPU to render. I believe this is not the typical use-case of EXA? How much of the framebuffer is re-drawn between flushes? Cheers, Tom From sumit.semwal at linaro.org Fri May 25 07:55:40 2012 From: sumit.semwal at linaro.org (Sumit Semwal) Date: Fri, 25 May 2012 13:25:40 +0530 Subject: [Linaro-mm-sig] [GIT PULL]: dma-buf updates for 3.5 Message-ID: Hi Linus, Here's the first signed-tag pull request for dma-buf framework. Could you please pull the dma-buf updates for 3.5? This includes the following key items: - mmap support - vmap support - related documentation updates These are needed by various drivers to allow mmap/vmap of dma-buf shared buffers. Dave Airlie has some prime patches dependent on the vmap pull as well. Thanks and best regards, ~Sumit. The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc: Linux 3.4 (2012-05-20 15:29:13 -0700) are available in the git repository at: ssh://sumitsemwal at git.linaro.org/~/public_git/linux-dma-buf.git tags/tag-for-linus-3.5 for you to fetch changes up to b25b086d23eb852bf3cfdeb60409b4967ebb3c0c: dma-buf: add initial vmap documentation (2012-05-25 12:51:11 +0530) ---------------------------------------------------------------- dma-buf updates for 3.5 ---------------------------------------------------------------- Daniel Vetter (1): dma-buf: mmap support Dave Airlie (2): dma-buf: add vmap interface dma-buf: add initial vmap documentation Sumit Semwal (1): dma-buf: minor documentation fixes. Documentation/dma-buf-sharing.txt | 109 ++++++++++++++++++++++++++++++++++--- drivers/base/dma-buf.c | 99 ++++++++++++++++++++++++++++++++- include/linux/dma-buf.h | 33 +++++++++++ 3 files changed, 233 insertions(+), 8 deletions(-) From airlied at gmail.com Fri May 25 09:04:17 2012 From: airlied at gmail.com (Dave Airlie) Date: Fri, 25 May 2012 10:04:17 +0100 Subject: [Linaro-mm-sig] [PATCH] dma-buf: fix disabled vmap function Message-ID: <1337936657-24837-1-git-send-email-airlied@gmail.com> From: Dave Airlie include/linux/dma-buf.h: In function ?dma_buf_vmap?: include/linux/dma-buf.h:260:1: warning: no return statement in function returning non-void [-Wreturn-type] Reported-by: wfg at linux.intel.com Signed-off-by: Dave Airlie --- include/linux/dma-buf.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h index d8c2865..506bb7b 100644 --- a/include/linux/dma-buf.h +++ b/include/linux/dma-buf.h @@ -257,6 +257,7 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf, static inline void *dma_buf_vmap(struct dma_buf *dmabuf) { + return NULL; } static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) -- 1.7.6 From sumit.semwal at linaro.org Fri May 25 09:17:10 2012 From: sumit.semwal at linaro.org (Sumit Semwal) Date: Fri, 25 May 2012 14:47:10 +0530 Subject: [Linaro-mm-sig] [GIT PULL]: dma-buf updates for 3.5 In-Reply-To: References: Message-ID: Hi Linus, On 25 May 2012 13:25, Sumit Semwal wrote: > Hi Linus, > > Here's the first signed-tag pull request for dma-buf framework. > > Could you please pull the dma-buf updates for 3.5? This includes the > following key items: > - mmap support > - vmap support > - related documentation updates > > These are needed by various drivers to allow mmap/vmap of dma-buf > shared buffers. Dave Airlie has some prime patches dependent on the > vmap pull as well. > > Thanks and best regards, > ~Sumit. > > > The following changes since commit 76e10d158efb6d4516018846f60c2ab5501900bc: > > ?Linux 3.4 (2012-05-20 15:29:13 -0700) > > are available in the git repository at: > > ?ssh://sumitsemwal at git.linaro.org/~/public_git/linux-dma-buf.git > tags/tag-for-linus-3.5 I am really sorry - I goofed up in the git URL (sent the ssh URL instead). Could you please use git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git tags/tag-for-linus-3.5 instead, or should I send a new pull request with the corrected URL? Thanks, and best regards, ~Sumit. > > for you to fetch changes up to b25b086d23eb852bf3cfdeb60409b4967ebb3c0c: > > ?dma-buf: add initial vmap documentation (2012-05-25 12:51:11 +0530) > > ---------------------------------------------------------------- > dma-buf updates for 3.5 > > ---------------------------------------------------------------- > Daniel Vetter (1): > ? ? ?dma-buf: mmap support > > Dave Airlie (2): > ? ? ?dma-buf: add vmap interface > ? ? ?dma-buf: add initial vmap documentation > > Sumit Semwal (1): > ? ? ?dma-buf: minor documentation fixes. > > ?Documentation/dma-buf-sharing.txt | ?109 ++++++++++++++++++++++++++++++++++--- > ?drivers/base/dma-buf.c ? ? ? ? ? ?| ? 99 ++++++++++++++++++++++++++++++++- > ?include/linux/dma-buf.h ? ? ? ? ? | ? 33 +++++++++++ > ?3 files changed, 233 insertions(+), 8 deletions(-) -- Thanks and regards, Sumit Semwal Linaro Kernel Engineer - Graphics working group Linaro.org???Open source software for ARM SoCs Follow?Linaro:?Facebook?|?Twitter?|?Blog From sumit.semwal at linaro.org Fri May 25 09:18:55 2012 From: sumit.semwal at linaro.org (Sumit Semwal) Date: Fri, 25 May 2012 14:48:55 +0530 Subject: [Linaro-mm-sig] [PATCH] dma-buf: fix disabled vmap function In-Reply-To: <1337936657-24837-1-git-send-email-airlied@gmail.com> References: <1337936657-24837-1-git-send-email-airlied@gmail.com> Message-ID: Hi Dave, On 25 May 2012 14:34, Dave Airlie wrote: > From: Dave Airlie > > include/linux/dma-buf.h: In function ?dma_buf_vmap?: > include/linux/dma-buf.h:260:1: warning: no return statement in function returning non-void [-Wreturn-type] > > Reported-by: wfg at linux.intel.com > Signed-off-by: Dave Airlie > --- > ?include/linux/dma-buf.h | ? ?1 + > ?1 files changed, 1 insertions(+), 0 deletions(-) > > diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h > index d8c2865..506bb7b 100644 > --- a/include/linux/dma-buf.h > +++ b/include/linux/dma-buf.h > @@ -257,6 +257,7 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf, > > ?static inline void *dma_buf_vmap(struct dma_buf *dmabuf) > ?{ > + ? ? ? return NULL; > ?} I fixed this as part of rebasing while applying your vmap patch to my for-next - so it is already in my pull request. Best regards, ~Sumit. > > ?static inline void dma_buf_vunmap(struct dma_buf *dmabuf, void *vaddr) > -- > 1.7.6 > > > _______________________________________________ > Linaro-mm-sig mailing list > Linaro-mm-sig at lists.linaro.org > http://lists.linaro.org/mailman/listinfo/linaro-mm-sig From airlied at gmail.com Fri May 25 10:01:16 2012 From: airlied at gmail.com (Dave Airlie) Date: Fri, 25 May 2012 11:01:16 +0100 Subject: [Linaro-mm-sig] [PATCH] dma-buf: fix disabled vmap function In-Reply-To: References: <1337936657-24837-1-git-send-email-airlied@gmail.com> Message-ID: On Fri, May 25, 2012 at 10:18 AM, Sumit Semwal wrote: > Hi Dave, > > On 25 May 2012 14:34, Dave Airlie wrote: >> From: Dave Airlie >> >> include/linux/dma-buf.h: In function ?dma_buf_vmap?: >> include/linux/dma-buf.h:260:1: warning: no return statement in function returning non-void [-Wreturn-type] >> >> Reported-by: wfg at linux.intel.com >> Signed-off-by: Dave Airlie >> --- >> ?include/linux/dma-buf.h | ? ?1 + >> ?1 files changed, 1 insertions(+), 0 deletions(-) >> >> diff --git a/include/linux/dma-buf.h b/include/linux/dma-buf.h >> index d8c2865..506bb7b 100644 >> --- a/include/linux/dma-buf.h >> +++ b/include/linux/dma-buf.h >> @@ -257,6 +257,7 @@ static inline void dma_buf_kunmap(struct dma_buf *dmabuf, >> >> ?static inline void *dma_buf_vmap(struct dma_buf *dmabuf) >> ?{ >> + ? ? ? return NULL; >> ?} > I fixed this as part of rebasing while applying your vmap patch to my > for-next - so it is already in my pull request. > Ah I didn't read the full warning mail, it was giving out about Tomasz tree, he must have merged an older version. Thanks, Dave. From tom.cooksey at arm.com Fri May 25 11:08:29 2012 From: tom.cooksey at arm.com (Tom Cooksey) Date: Fri, 25 May 2012 12:08:29 +0100 Subject: [Linaro-mm-sig] [RFC] Synchronizing access to buffers shared with dma-buf between drivers/devices Message-ID: <000201cd3a66$b7182320$25486960$@cooksey@arm.com> Hi All, I realise it's been a while since this was last discussed, however I'd like to bring up kernel-side synchronization again. By kernel-side synchronization, I mean allowing multiple drivers/devices wanting to access the same buffer to do so without bouncing up to userspace to resolve dependencies such as "the display controller can't start scanning out a buffer until the GPU has finished rendering into it". As such, this is really just an optimization which reduces latency between E.g. The GPU finishing a rendering job and that buffer being scanned out. I appreciate this particular example is already solved on desktop graphics cards as the display controller and 3D core are both controlled by the same driver, so no "generic" mechanism is needed. However on ARM SoCs, the 3D core (like an ARM Mali) and display controller tend to be driven by separate drivers, so some mechanism is needed to allow both drivers to synchronize their access to buffers. There are multiple ways synchronization can be achieved, fences/sync objects is one common approach, however we're presenting a different approach. Personally, I quite like fence sync objects, however we believe it requires a lot of userspace interfaces to be changed to pass around sync object handles. Our hope is that the kds approach will require less effort to make use of as no existing userspace interfaces need to be changed. E.g. To use explicit fences, the struct drm_mode_crtc_page_flip would need a new members to pass in the handle(s) of sync object(s) which the flip depends on (I.e. don't flip until these fences fire). The additional benefit of our approach is that it prevents userspace specifying dependency loops which can cause a deadlock (see kds.txt for an explanation of what I mean here). I have waited until now to bring this up again because I am now able to share the code I was trying (and failing I think) to explain previously. The code has now been released under the GPLv2 from ARM Mali's developer portal, however I've attempted to turn that into a patch to allow it to be discussed on this list. Please find the patch inline below. While KDS defines a very generic mechanism, I am proposing that this code or at least the concepts be merged with the existing dma_buf code, so a the struct kds_resource members get moved to struct dma_buf, kds_* functions get renamed to dma_buf_* functions, etc. So I guess what I'm saying is please don't review the actual code just yet, only the concepts the code describes, where kds_resource == dma_duf. Cheers, Tom Author: Tom Cooksey Date: Fri May 25 10:45:27 2012 +0100 Add new system to allow synchronizing access to resources See Documentation/kds.txt for details, however the general idea is that this kds framework synchronizes multiple drivers ("clients") wanting to access the same resources, where a resource is typically a 2D image buffer being shared around using dma-buf. Note: This patch is created by extracting the sources from the tarball on and putting them in roughly the right places. diff --git a/Documentation/kds.txt b/Documentation/kds.txt new file mode 100644 index 0000000..a96db21 --- /dev/null +++ b/Documentation/kds.txt @@ -0,0 +1,113 @@ +# +# (C) COPYRIGHT 2012 ARM Limited. All rights reserved. +# +# This program is free software and is provided to you under the terms of the GNU General Public License version 2 +# as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. +# +# A copy of the licence is included with the program, and can also be obtained from Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# + + +============================== +kds - Kernel Dependency System +============================== + +Introduction +------------ +kds provides a mechanism for clients to atomically lock down multiple abstract resources. +This can be done either synchronously or asynchronously. +Abstract resources is used to allow a set of clients to use kds to control access to any +resource, an example is structured memory buffers. + +kds supports that buffer is locked for exclusive access and sharing of buffers. + +kds can be built as either a integrated feature of the kernel or as a module. +It supports being compiled as a module both in-tree and out-of-tree. + + +Concepts +-------- +A core concept in kds is abstract resources. +A kds resource is just an abstraction for some client object, kds doesn't care what it is. +Typically EGL will consider UMP buffers as being a resource, thus each UMP buffer has +a kds resource for synchronization to the buffer. + +kds allows a client to create and destroy the abstract resource objects. +A new resource object is made available asap (it is just a simple malloc with some initializations), +while destroy it requires some external synchronization. + +The other core concept in kds is consumer of resources. +kds is requested to allow a client to consume a set of resources and the client will be notified when it can consume the resources. + +Exclusive access allows only one client to consume a resource. +Shared access permits multiple consumers to acceess a resource concurrently. + + +APIs +---- +kds provides simple resource allocate and destroy functions. +Clients use this to instantiate and control the lifetime of the resources kds manages. + +kds provides two ways to wait for resources: +- Asynchronous wait: the client specifies a function pointer to be called when wait is over +- Synchronous wait: Function blocks until access is gained. + +The synchronous API has a timeout for the wait. +The call can early out if a signal is delivered. + +After a client is done consuming the resource kds must be notified to release the resources and let some other client take ownership. +This is done via resource set release call. + +A Windows comparison: +kds implements WaitForMultipleObjectsEx(..., bWaitAll = TRUE, ...) but also has an asynchronous version in addition. +kds resources can be seen as being the same as NT object manager resources. + +Internals +--------- +kds guarantees atomicity when a set of resources is operated on. +This is implemented via a global resource lock which is taken by kds when it updates resource objects. + +Internally a resource in kds is a linked list head with some flags. + +When a consumer requests access to a set of resources it is queued on each of the resources. +The link from the consumer to the resources can be triggered. Once all links are triggered +the registered callback is called or the blocking function returns. +A link is considered triggered if it is the first on the list of consumers of a resource, +or if all the links ahead of it is marked as shared and itself is of the type shared. + +When the client is done consuming the consumer object is removed from the linked lists of +the resources and a potential new consumer becomes the head of the resources. +As we add and remove consumers atomically across all resources we can guarantee that +we never introduces a A->B + B->A type of loops/deadlocks. + + +kbase/base implementation +------------------------- +A HW job needs access to a set of shared resources. +EGL tracks this and encodes the set along with the atom in the ringbuffer. +EGL allocates a (k)base dep object to represent the dependency to the set of resources and encodes that along with the list of resources. +This dep object is use to create a dependency from a job chain(atom) to the resources it needs to run. +When kbase decodes the atom in the ringbuffer it finds the set of resources and calls kds to request all the needed resources. +As EGL needs to know when the kds request is delivered a new base event object is needed: atom enqueued. This event is only delivered for atoms which uses kds. +The callback kbase registers trigger the dependency object described which would trigger the existing JD system to release the job chain. +When the atom is done kds resource set release is call to release the resources. + +EGL will typically use exclusive access to the render target, while all buffers used as input can be marked as shared. + + +Buffer publish/vsync +-------------------- +EGL will use a separate ioctl or DRM flip to request the flip. +If the LCD driver is integrated with kds EGL can do these operations early. +The LCD driver must then implement the ioctl or DRM flip to be asynchronous with kds async call. +The LCD driver binds a kds resource to each virtual buffer (2 buffers in case of double-buffering). +EGL will make a dependency to the target kds resource in the kbase atom. +After EGL receives a atom enqueued event it can ask the LCD driver to pan to the target kds resource. +When the atom is completed it'll release the resource and the LCD driver will get its callback. +In the callback it'll load the target buffer into the DMA unit of the LCD hardware. +The LCD driver will be the consumer of both buffers for a short period. +The LCD driver will call kds resource set release on the previous on-screen buffer when the next vsync/dma read end is handled. + + diff --git a/drivers/misc/kds.c b/drivers/misc/kds.c new file mode 100644 index 0000000..8d7d55e --- /dev/null +++ b/drivers/misc/kds.c @@ -0,0 +1,461 @@ +/* + * + * (C) COPYRIGHT 2012 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. + * + * A copy of the licence is included with the program, and can also be obtained from Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + + + +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#define KDS_LINK_TRIGGERED (1u << 0) +#define KDS_LINK_EXCLUSIVE (1u << 1) + +#define KDS_IGNORED NULL +#define KDS_INVALID (void*)-2 +#define KDS_RESOURCE (void*)-1 + +struct kds_resource_set +{ + unsigned long num_resources; + unsigned long pending; + unsigned long locked_resources; + struct kds_callback * cb; + void * callback_parameter; + void * callback_extra_parameter; + struct list_head callback_link; + struct work_struct callback_work; + struct kds_link resources[0]; +}; + +static DEFINE_MUTEX(kds_lock); + +int kds_callback_init(struct kds_callback * cb, int direct, kds_callback_fn user_cb) +{ + int ret = 0; + + cb->direct = direct; + cb->user_cb = user_cb; + + if (!direct) + { + cb->wq = alloc_workqueue("kds", WQ_UNBOUND | WQ_HIGHPRI, WQ_UNBOUND_MAX_ACTIVE); + if (!cb->wq) + ret = -ENOMEM; + } + else + { + cb->wq = NULL; + } + + return ret; +} +EXPORT_SYMBOL(kds_callback_init); + +void kds_callback_term(struct kds_callback * cb) +{ + if (!cb->direct) + { + BUG_ON(!cb->wq); + destroy_workqueue(cb->wq); + } + else + { + BUG_ON(cb->wq); + } +} + +EXPORT_SYMBOL(kds_callback_term); + +static void kds_do_user_callback(struct kds_resource_set * rset) +{ + rset->cb->user_cb(rset->callback_parameter, rset->callback_extra_parameter); +} + +static void kds_queued_callback(struct work_struct * work) +{ + struct kds_resource_set * rset; + rset = container_of( work, struct kds_resource_set, callback_work); + + kds_do_user_callback(rset); +} + +static void kds_callback_perform(struct kds_resource_set * rset) +{ + if (rset->cb->direct) + kds_do_user_callback(rset); + else + { + int result; + result = queue_work(rset->cb->wq, &rset->callback_work); + /* if we got a 0 return it means we've triggered the same rset twice! */ + BUG_ON(!result); + } +} + +void kds_resource_init(struct kds_resource * res) +{ + BUG_ON(!res); + INIT_LIST_HEAD(&res->waiters.link); + res->waiters.parent = KDS_RESOURCE; +} +EXPORT_SYMBOL(kds_resource_init); + +void kds_resource_term(struct kds_resource * res) +{ + BUG_ON(!res); + BUG_ON(!list_empty(&res->waiters.link)); + res->waiters.parent = KDS_INVALID; +} +EXPORT_SYMBOL(kds_resource_term); + +int kds_async_waitall( + struct kds_resource_set ** pprset, + unsigned long flags, + struct kds_callback * cb, + void * callback_parameter, + void * callback_extra_parameter, + int number_resources, + unsigned long * exclusive_access_bitmap, + struct kds_resource ** resource_list) +{ + struct kds_resource_set * rset = NULL; + int i; + int triggered; + int err = -EFAULT; + + BUG_ON(!pprset); + BUG_ON(!resource_list); + BUG_ON(!cb); + + mutex_lock(&kds_lock); + + if ((flags & KDS_FLAG_LOCKED_ACTION) == KDS_FLAG_LOCKED_FAIL) + { + for (i = 0; i < number_resources; i++) + { + if (resource_list[i]->lock_count) + { + err = -EBUSY; + goto errout; + } + } + } + + rset = kmalloc(sizeof(*rset) + number_resources * sizeof(struct kds_link), GFP_KERNEL); + if (!rset) + { + err = -ENOMEM; + goto errout; + } + + rset->num_resources = number_resources; + rset->pending = number_resources; + rset->locked_resources = 0; + rset->cb = cb; + rset->callback_parameter = callback_parameter; + rset->callback_extra_parameter = callback_extra_parameter; + INIT_LIST_HEAD(&rset->callback_link); + INIT_WORK(&rset->callback_work, kds_queued_callback); + + for (i = 0; i < number_resources; i++) + { + unsigned long link_state = 0; + + INIT_LIST_HEAD(&rset->resources[i].link); + rset->resources[i].parent = rset; + + if (test_bit(i, exclusive_access_bitmap)) + { + link_state |= KDS_LINK_EXCLUSIVE; + } + + /* no-one else waiting? */ + if (list_empty(&resource_list[i]->waiters.link)) + { + link_state |= KDS_LINK_TRIGGERED; + rset->pending--; + } + /* Adding a non-exclusive and the current tail is a triggered non-exclusive? */ + else if (((link_state & KDS_LINK_EXCLUSIVE) == 0) && + (((list_entry(resource_list[i]->waiters.link.prev, struct kds_link, link)->state & (KDS_LINK_EXCLUSIVE | KDS_LINK_TRIGGERED)) == KDS_LINK_TRIGGERED))) + { + link_state |= KDS_LINK_TRIGGERED; + rset->pending--; + } + /* locked & ignore locked? */ + else if ((resource_list[i]->lock_count) && ((flags & KDS_FLAG_LOCKED_ACTION) == KDS_FLAG_LOCKED_IGNORE) ) + { + link_state |= KDS_LINK_TRIGGERED; + rset->pending--; + rset->resources[i].parent = KDS_IGNORED; /* to disable decrementing the pending count when we get the ignored resource */ + } + rset->resources[i].state = link_state; + list_add_tail(&rset->resources[i].link, &resource_list[i]->waiters.link); + } + + triggered = (rset->pending == 0); + + mutex_unlock(&kds_lock); + + /* set the pointer before the callback is called so it sees it */ + *pprset = rset; + + if (triggered) + { + /* all resources obtained, trigger callback */ + kds_callback_perform(rset); + } + + return 0; + +errout: + mutex_unlock(&kds_lock); + return err; +} +EXPORT_SYMBOL(kds_async_waitall); + +static void wake_up_sync_call(void * callback_parameter, void * callback_extra_parameter) +{ + wait_queue_head_t * wait = (wait_queue_head_t*)callback_parameter; + wake_up(wait); +} + +static struct kds_callback sync_cb = +{ + wake_up_sync_call, + 1, + NULL, +}; + +struct kds_resource_set * kds_waitall( + int number_resources, + unsigned long * exclusive_access_bitmap, + struct kds_resource ** resource_list, + unsigned long jiffies_timeout) +{ + struct kds_resource_set * rset; + int i; + int triggered = 0; + DECLARE_WAIT_QUEUE_HEAD_ONSTACK(wake); + + rset = kmalloc(sizeof(*rset) + number_resources * sizeof(struct kds_link), GFP_KERNEL); + if (!rset) + return rset; + + rset->num_resources = number_resources; + rset->pending = number_resources; + rset->locked_resources = 1; + INIT_LIST_HEAD(&rset->callback_link); + INIT_WORK(&rset->callback_work, kds_queued_callback); + + mutex_lock(&kds_lock); + + for (i = 0; i < number_resources; i++) + { + unsigned long link_state = 0; + + if (likely(resource_list[i]->lock_count < ULONG_MAX)) + resource_list[i]->lock_count++; + else + break; + + if (test_bit(i, exclusive_access_bitmap)) + { + link_state |= KDS_LINK_EXCLUSIVE; + } + + if (list_empty(&resource_list[i]->waiters.link)) + { + link_state |= KDS_LINK_TRIGGERED; + rset->pending--; + } + /* Adding a non-exclusive and the current tail is a triggered non-exclusive? */ + else if (((link_state & KDS_LINK_EXCLUSIVE) == 0) && + (((list_entry(resource_list[i]->waiters.link.prev, struct kds_link, link)->state & (KDS_LINK_EXCLUSIVE | KDS_LINK_TRIGGERED)) == KDS_LINK_TRIGGERED))) + { + link_state |= KDS_LINK_TRIGGERED; + rset->pending--; + } + + INIT_LIST_HEAD(&rset->resources[i].link); + rset->resources[i].parent = rset; + rset->resources[i].state = link_state; + list_add_tail(&rset->resources[i].link, &resource_list[i]->waiters.link); + } + + if (i < number_resources) + { + /* an overflow was detected, roll back */ + while (i--) + { + list_del(&rset->resources[i].link); + resource_list[i]->lock_count--; + } + mutex_unlock(&kds_lock); + kfree(rset); + return ERR_PTR(-EFAULT); + } + + if (rset->pending == 0) + triggered = 1; + else + { + rset->cb = &sync_cb; + rset->callback_parameter = &wake; + rset->callback_extra_parameter = NULL; + } + + mutex_unlock(&kds_lock); + + if (!triggered) + { + long wait_res; + if ( KDS_WAIT_BLOCKING == jiffies_timeout ) + { + wait_res = wait_event_interruptible(wake, rset->pending == 0); + } + else + { + wait_res = wait_event_interruptible_timeout(wake, rset->pending == 0, jiffies_timeout); + } + if ((wait_res == -ERESTARTSYS) || (wait_res == 0)) + { + /* use \a kds_resource_set_release to roll back */ + kds_resource_set_release(&rset); + return ERR_PTR(wait_res); + } + } + return rset; +} +EXPORT_SYMBOL(kds_waitall); + +void kds_resource_set_release(struct kds_resource_set ** pprset) +{ + struct list_head triggered = LIST_HEAD_INIT(triggered); + struct kds_resource_set * rset; + struct kds_resource_set * it; + int i; + + BUG_ON(!pprset); + + mutex_lock(&kds_lock); + + rset = *pprset; + if (!rset) + { + /* caught a race between a cancelation + * and a completion, nothing to do */ + mutex_unlock(&kds_lock); + return; + } + + /* clear user pointer so we'll be the only + * thread handling the release */ + *pprset = NULL; + + for (i = 0; i < rset->num_resources; i++) + { + struct kds_resource * resource; + struct kds_link * it = NULL; + + /* fetch the previous entry on the linked list */ + it = list_entry(rset->resources[i].link.prev, struct kds_link, link); + /* unlink ourself */ + list_del(&rset->resources[i].link); + + /* any waiters? */ + if (list_empty(&it->link)) + continue; + + /* were we the head of the list? (head if prev is a resource) */ + if (it->parent != KDS_RESOURCE) + continue; + + /* we were the head, find the kds_resource */ + resource = container_of(it, struct kds_resource, waiters); + + if (rset->locked_resources) + { + resource->lock_count--; + } + + /* we know there is someone waiting from the any-waiters test above */ + + /* find the head of the waiting list */ + it = list_first_entry(&resource->waiters.link, struct kds_link, link); + + /* new exclusive owner? */ + if (it->state & KDS_LINK_EXCLUSIVE) + { + /* link now triggered */ + it->state |= KDS_LINK_TRIGGERED; + /* a parent to update? */ + if (it->parent != KDS_IGNORED) + { + if (0 == --it->parent->pending) + { + /* new owner now triggered, track for callback later */ + list_add(&it->parent->callback_link, &triggered); + } + } + } + /* exclusive releasing ? */ + else if (rset->resources[i].state & KDS_LINK_EXCLUSIVE) + { + /* trigger non-exclusive until end-of-list or first exclusive */ + list_for_each_entry(it, &resource->waiters.link, link) + { + /* exclusive found, stop triggering */ + if (it->state & KDS_LINK_EXCLUSIVE) + break; + + it->state |= KDS_LINK_TRIGGERED; + /* a parent to update? */ + if (it->parent != KDS_IGNORED) + { + if (0 == --it->parent->pending) + { + /* new owner now triggered, track for callback later */ + list_add(&it->parent->callback_link, &triggered); + } + } + } + } + + } + + mutex_unlock(&kds_lock); + + while (!list_empty(&triggered)) + { + it = list_first_entry(&triggered, struct kds_resource_set, callback_link); + list_del(&it->callback_link); + kds_callback_perform(it); + } + + cancel_work_sync(&rset->callback_work); + + /* free the resource set */ + kfree(rset); +} +EXPORT_SYMBOL(kds_resource_set_release); + +MODULE_LICENSE("GPL"); +MODULE_AUTHOR("ARM Ltd."); +MODULE_VERSION("1.0"); diff --git a/include/linux/kds.h b/include/linux/kds.h new file mode 100644 index 0000000..65e5706 --- /dev/null +++ b/include/linux/kds.h @@ -0,0 +1,154 @@ +/* + * + * (C) COPYRIGHT 2012 ARM Limited. All rights reserved. + * + * This program is free software and is provided to you under the terms of the GNU General Public License version 2 + * as published by the Free Software Foundation, and any use by you of this program is subject to the terms of such GNU licence. + * + * A copy of the licence is included with the program, and can also be obtained from Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + + + +#ifndef _KDS_H_ +#define _KDS_H_ + +#include +#include + +#define KDS_WAIT_BLOCKING (ULONG_MAX) + +/* what to do when waitall must wait for a synchronous locked resource: */ +#define KDS_FLAG_LOCKED_FAIL (0u << 0) /* fail waitall */ +#define KDS_FLAG_LOCKED_IGNORE (1u << 0) /* don't wait, but block other that waits */ +#define KDS_FLAG_LOCKED_WAIT (2u << 0) /* wait (normal */ +#define KDS_FLAG_LOCKED_ACTION (3u << 0) /* mask to extract the action to do on locked resources */ + +struct kds_resource_set; + +typedef void (*kds_callback_fn) (void * callback_parameter, void * callback_extra_parameter); + +struct kds_callback +{ + kds_callback_fn user_cb; /* real cb */ + int direct; /* do direct or queued call? */ + struct workqueue_struct * wq; +}; + +struct kds_link +{ + struct kds_resource_set * parent; + struct list_head link; + unsigned long state; +}; + +struct kds_resource +{ + struct kds_link waiters; + unsigned long lock_count; +}; + +/* callback API */ + +/* Initialize a callback object. + * + * Typically created per context or per hw resource. + * + * Callbacks can be performed directly if no nested locking can + * happen in the client. + * + * Nested locking can occur when a lock is held during the kds_async_waitall or + * kds_resource_set_release call. If the callback needs to take the same lock + * nested locking will happen. + * + * If nested locking could happen non-direct callbacks can be requested. + * Callbacks will then be called asynchronous to the triggering call. + */ +int kds_callback_init(struct kds_callback * cb, int direct, kds_callback_fn user_cb); + +/* Terminate the use of a callback object. + * + * If the callback object was set up as non-direct + * any pending callbacks will be flushed first. + * Note that to avoid a deadlock the lock callbacks needs + * can't be held when a callback object is terminated. + */ +void kds_callback_term(struct kds_callback * cb); + + +/* resource object API */ + +/* initialize a resource handle for a shared resource */ +void kds_resource_init(struct kds_resource * resource); + +/* + * Will assert if the resource is being used or waited on. + * The caller should NOT try to terminate a resource that could still have clients. + * After the function returns the resource is no longer known by kds. + */ +void kds_resource_term(struct kds_resource * resource); + +/* Asynchronous wait for a set of resources. + * Callback will be called when all resources are available. + * If all the resources was available the callback will be called before kds_async_waitall returns. + * So one must not hold any locks the callback code-flow can take when calling kds_async_waitall. + * Caller considered to own/use the resources until \a kds_rset_release is called. + * flags is one or more of the KDS_FLAG_* set. + * exclusive_access_bitmap is a bitmap where a high bit means exclusive access while a low bit means shared access. + * Use the Linux __set_bit API, where the index of the buffer to control is used as the bit index. + * + * Standard Linux error return value. + */ +int kds_async_waitall( + struct kds_resource_set ** pprset, + unsigned long flags, + struct kds_callback * cb, + void * callback_parameter, + void * callback_extra_parameter, + int number_resources, + unsigned long * exclusive_access_bitmap, + struct kds_resource ** resource_list); + +/* Synchronous wait for a set of resources. + * Function will return when one of these have happened: + * - all resources have been obtained + * - timeout lapsed while waiting + * - a signal was received while waiting + * + * Caller considered to own/use the resources when the function returns. + * Caller must release the resources using \a kds_rset_release. + * + * Calling this function while holding already locked resources or other locking primitives is dangerous. + * One must if this is needed decide on a lock order of the resources and/or the other locking primitives + * and always take the resources/locking primitives in the specific order. + * + * Use the ERR_PTR framework to decode the return value. + * NULL = time out + * If IS_ERR then PTR_ERR gives: + * ERESTARTSYS = signal received, retry call after signal + * all other values = internal error, lock failed + * Other values = successful wait, now the owner, must call kds_resource_set_release + */ +struct kds_resource_set * kds_waitall( + int number_resources, + unsigned long * exclusive_access_bitmap, + struct kds_resource ** resource_list, + unsigned long jifies_timeout); + +/* Release resources after use. + * Caller must handle that other async callbacks will trigger, + * so must avoid holding any locks a callback will take. + * + * The function takes a pointer to your poiner to handle a race + * between a cancelation and a completion. + * + * If the caller can't guarantee that a race can't occur then + * the passed in pointer must be the same in both call paths + * to allow kds to manage the potential race. + */ +void kds_resource_set_release(struct kds_resource_set ** pprset); + +#endif /* _KDS_H_ */ + From arnd at arndb.de Sat May 26 07:48:29 2012 From: arnd at arndb.de (Arnd Bergmann) Date: Sat, 26 May 2012 07:48:29 +0000 Subject: [Linaro-mm-sig] [GIT PULL]: dma-buf updates for 3.5 In-Reply-To: References: Message-ID: <201205260748.29800.arnd@arndb.de> On Friday 25 May 2012, Linus Torvalds wrote: > Please do something like > > gpg --keyserver pgp.mit.edu --send-keys 7126925D > > to actually make your public key public. > > Of course, if it isn't public, I assume it hasn't actually been signed > by anybody, which makes it largely useless. But any future signing > action will validate the pre-signing uses of the key, so that's > fixable. We have a Linaro meeting this week, so we will make sure to get this key and other relevant ones signed by everyone who is here and in the kernel keyring. Arnd From sumit.semwal at linaro.org Sat May 26 14:17:54 2012 From: sumit.semwal at linaro.org (Sumit Semwal) Date: Sat, 26 May 2012 19:47:54 +0530 Subject: [Linaro-mm-sig] [GIT PULL]: dma-buf updates for 3.5 In-Reply-To: References: Message-ID: Hi Linus, On 25 May 2012 22:14, Linus Torvalds wrote: > On Fri, May 25, 2012 at 2:17 AM, Sumit Semwal wrote: >> >> I am really sorry - I goofed up in the git URL (sent the ssh URL >> instead). > > I was going to send you an acerbic email asking for your private ssh > key, but then noticed that you had sent another email with the public > version of the git tree.. Well, it was stupid indeed - learning for me; won't happen again. > >> Could you please use >> >> git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git tags/tag-for-linus-3.5 >> >> instead, or should I send a new pull request with the corrected URL? > > Done. However, while your tag seems to be signed, your key is not > available publicly: > > ? [torvalds at i5 ~]$ gpg --recv-key 7126925D > ? gpg: requesting key 7126925D from hkp server pgp.mit.edu > ? gpgkeys: key 7126925D not found on keyserver > > so I can't check if it is signed by anybody. > > Please do something like > > ? gpg --keyserver pgp.mit.edu --send-keys 7126925D > > to actually make your public key public. Thanks; it is done. > > Of course, if it isn't public, I assume it hasn't actually been signed > by anybody, which makes it largely useless. But any future signing > action will validate the pre-signing uses of the key, so that's > fixable. Like Arnd has mentioned, we would do a key signing party here at the Linaro meeting, and make sure that relevant ones are signed. > > ? ? ? ? ? ? ? ? ? ? Linus -- Thanks and best regards, ~Sumit From torvalds at linux-foundation.org Fri May 25 16:44:11 2012 From: torvalds at linux-foundation.org (Linus Torvalds) Date: Fri, 25 May 2012 09:44:11 -0700 Subject: [Linaro-mm-sig] [GIT PULL]: dma-buf updates for 3.5 In-Reply-To: References: Message-ID: On Fri, May 25, 2012 at 2:17 AM, Sumit Semwal wrote: > > I am really sorry - I goofed up in the git URL (sent the ssh URL > instead). I was going to send you an acerbic email asking for your private ssh key, but then noticed that you had sent another email with the public version of the git tree.. > Could you please use > > git://git.linaro.org/people/sumitsemwal/linux-dma-buf.git tags/tag-for-linus-3.5 > > instead, or should I send a new pull request with the corrected URL? Done. However, while your tag seems to be signed, your key is not available publicly: [torvalds at i5 ~]$ gpg --recv-key 7126925D gpg: requesting key 7126925D from hkp server pgp.mit.edu gpgkeys: key 7126925D not found on keyserver so I can't check if it is signed by anybody. Please do something like gpg --keyserver pgp.mit.edu --send-keys 7126925D to actually make your public key public. Of course, if it isn't public, I assume it hasn't actually been signed by anybody, which makes it largely useless. But any future signing action will validate the pre-signing uses of the key, so that's fixable. Linus From kosaki.motohiro at gmail.com Sun May 27 12:35:23 2012 From: kosaki.motohiro at gmail.com (KOSAKI Motohiro) Date: Sun, 27 May 2012 08:35:23 -0400 Subject: [Linaro-mm-sig] [PATCHv2 3/4] mm: vmalloc: add VM_DMA flag to indicate areas used by dma-mapping framework In-Reply-To: <20120524122854.GD11860@linux-sh.org> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-4-git-send-email-m.szyprowski@samsung.com> <4FBB3B41.8010102@kernel.org> <01e501cd39a8$67f34ea0$37d9ebe0$%szyprowski@samsung.com> <20120524122854.GD11860@linux-sh.org> Message-ID: On Thu, May 24, 2012 at 8:28 AM, Paul Mundt wrote: > On Thu, May 24, 2012 at 02:26:12PM +0200, Marek Szyprowski wrote: >> On Tuesday, May 22, 2012 9:08 AM Minchan Kim wrote: >> > Hmm, VM_DMA would become generic flag? >> > AFAIU, maybe VM_DMA would be used only on ARM arch. >> >> Right now yes, it will be used only on ARM architecture, but maybe other architecture will >> start using it once it is available. >> > There's very little about the code in question that is ARM-specific to > begin with. I plan to adopt similar changes on SH once the work has > settled one way or the other, so we'll probably use the VMA flag there, > too. I don't think VM_DMA is good idea because x86_64 has two dma zones. x86 unaware patches make no sense. From m.szyprowski at samsung.com Mon May 28 08:19:39 2012 From: m.szyprowski at samsung.com (Marek Szyprowski) Date: Mon, 28 May 2012 10:19:39 +0200 Subject: [Linaro-mm-sig] [PATCHv2 3/4] mm: vmalloc: add VM_DMA flag to indicate areas used by dma-mapping framework In-Reply-To: References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-4-git-send-email-m.szyprowski@samsung.com> <4FBB3B41.8010102@kernel.org> <01e501cd39a8$67f34ea0$37d9ebe0$%szyprowski@samsung.com> <20120524122854.GD11860@linux-sh.org> Message-ID: <001d01cd3caa$a05d0510$e1170f30$%szyprowski@samsung.com> Hello, On Sunday, May 27, 2012 2:35 PM KOSAKI Motohiro wrote: > On Thu, May 24, 2012 at 8:28 AM, Paul Mundt wrote: > > On Thu, May 24, 2012 at 02:26:12PM +0200, Marek Szyprowski wrote: > >> On Tuesday, May 22, 2012 9:08 AM Minchan Kim wrote: > >> > Hmm, VM_DMA would become generic flag? > >> > AFAIU, maybe VM_DMA would be used only on ARM arch. > >> > >> Right now yes, it will be used only on ARM architecture, but maybe other architecture will > >> start using it once it is available. > >> > > There's very little about the code in question that is ARM-specific to > > begin with. I plan to adopt similar changes on SH once the work has > > settled one way or the other, so we'll probably use the VMA flag there, > > too. > > I don't think VM_DMA is good idea because x86_64 has two dma zones. x86 unaware > patches make no sense. I see no problems to add VM_DMA64 later if x86_64 starts using vmalloc areas for creating kernel mappings for the dma buffers (I assume that there are 2 dma zones: one 32bit and one 64bit). Right now x86 and x86_64 don't use vmalloc areas for dma buffers, so I hardly see how this patch can be considered as 'x86 unaware'. Best regards -- Marek Szyprowski Samsung Poland R&D Center From laurent.pinchart at ideasonboard.com Mon May 28 21:12:06 2012 From: laurent.pinchart at ideasonboard.com (Laurent Pinchart) Date: Mon, 28 May 2012 23:12:06 +0200 Subject: [Linaro-mm-sig] [PATCHv6 01/13] v4l: Add DMABUF as a memory type In-Reply-To: <1337775027-9489-2-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> <1337775027-9489-2-git-send-email-t.stanislaws@samsung.com> Message-ID: <39362499.rezgOX57D6@avalon> Hi Tomasz, Thanks for the patch. On Wednesday 23 May 2012 14:10:15 Tomasz Stanislawski wrote: > From: Sumit Semwal > > Adds DMABUF memory type to v4l framework. Also adds the related file > descriptor in v4l2_plane and v4l2_buffer. Sorry not to have caught this earlier, but haven't you forgotten to add support for V4L2_MEMORY_DMABUF to v4l2-compat-ioctl32.c ? > Signed-off-by: Tomasz Stanislawski > [original work in the PoC for buffer sharing] > Signed-off-by: Sumit Semwal > Signed-off-by: Sumit Semwal > Acked-by: Laurent Pinchart > --- > drivers/media/video/v4l2-ioctl.c | 1 + > include/linux/videodev2.h | 7 +++++++ > 2 files changed, 8 insertions(+) > > diff --git a/drivers/media/video/v4l2-ioctl.c > b/drivers/media/video/v4l2-ioctl.c index 91be4e8..31fc2ad 100644 > --- a/drivers/media/video/v4l2-ioctl.c > +++ b/drivers/media/video/v4l2-ioctl.c > @@ -175,6 +175,7 @@ static const char *v4l2_memory_names[] = { > [V4L2_MEMORY_MMAP] = "mmap", > [V4L2_MEMORY_USERPTR] = "userptr", > [V4L2_MEMORY_OVERLAY] = "overlay", > + [V4L2_MEMORY_DMABUF] = "dmabuf", > }; > > #define prt_names(a, arr) ((((a) >= 0) && ((a) < ARRAY_SIZE(arr))) ? \ > diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h > index 370d111..51b20f4 100644 > --- a/include/linux/videodev2.h > +++ b/include/linux/videodev2.h > @@ -185,6 +185,7 @@ enum v4l2_memory { > V4L2_MEMORY_MMAP = 1, > V4L2_MEMORY_USERPTR = 2, > V4L2_MEMORY_OVERLAY = 3, > + V4L2_MEMORY_DMABUF = 4, > }; > > /* see also http://vektor.theorem.ca/graphics/ycbcr/ */ > @@ -591,6 +592,8 @@ struct v4l2_requestbuffers { > * should be passed to mmap() called on the video node) > * @userptr: when memory is V4L2_MEMORY_USERPTR, a userspace pointer > * pointing to this plane > + * @fd: when memory is V4L2_MEMORY_DMABUF, a userspace file > + * descriptor associated with this plane > * @data_offset: offset in the plane to the start of data; usually 0, > * unless there is a header in front of the data > * > @@ -605,6 +608,7 @@ struct v4l2_plane { > union { > __u32 mem_offset; > unsigned long userptr; > + int fd; > } m; > __u32 data_offset; > __u32 reserved[11]; > @@ -629,6 +633,8 @@ struct v4l2_plane { > * (or a "cookie" that should be passed to mmap() as offset) > * @userptr: for non-multiplanar buffers with memory == > V4L2_MEMORY_USERPTR; * a userspace pointer pointing to this buffer > + * @fd: for non-multiplanar buffers with memory == V4L2_MEMORY_DMABUF; > + * a userspace file descriptor associated with this buffer > * @planes: for multiplanar buffers; userspace pointer to the array of > plane * info structs for this buffer > * @length: size in bytes of the buffer (NOT its payload) for single- plane > @@ -655,6 +661,7 @@ struct v4l2_buffer { > __u32 offset; > unsigned long userptr; > struct v4l2_plane *planes; > + int fd; > } m; > __u32 length; > __u32 input; -- Regards, Laurent Pinchart From laurent.pinchart at ideasonboard.com Mon May 28 21:30:05 2012 From: laurent.pinchart at ideasonboard.com (Laurent Pinchart) Date: Mon, 28 May 2012 23:30:05 +0200 Subject: [Linaro-mm-sig] [PATCHv6 02/13] Documentation: media: description of DMABUF importing in V4L2 In-Reply-To: <1337775027-9489-3-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> <1337775027-9489-3-git-send-email-t.stanislaws@samsung.com> Message-ID: <3552222.dzY4fiG81O@avalon> Hi Tomasz, Thanks for the patch. On Wednesday 23 May 2012 14:10:16 Tomasz Stanislawski wrote: > This patch adds description and usage examples for importing > DMABUF file descriptor in V4L2. > > Signed-off-by: Tomasz Stanislawski > Signed-off-by: Kyungmin Park > CC: linux-doc at vger.kernel.org [snip] > @@ -103,6 +105,7 @@ as the &v4l2-format; type > field. See memory > Applications set this field to > V4L2_MEMORY_MMAP or > +V4L2_MEMORY_DMABUF or > V4L2_MEMORY_USERPTR. See />. > If you resubmit to fix the compat-ioctl issue in 01/13, could you please replace this with Applications set this field to V4L2_MEMORY_MMAP, V4L2_MEMORY_DMABUF or V4L2_MEMORY_USERPTR. See . like in v5 ? -- Regards, Laurent Pinchart From laurent.pinchart at ideasonboard.com Mon May 28 22:25:03 2012 From: laurent.pinchart at ideasonboard.com (Laurent Pinchart) Date: Tue, 29 May 2012 00:25:03 +0200 Subject: [Linaro-mm-sig] [PATCHv6 00/13] Integration of videobuf2 with dmabuf In-Reply-To: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> Message-ID: <5090892.Z3RkLXNQ1U@avalon> Hi Tomasz, On Wednesday 23 May 2012 14:10:14 Tomasz Stanislawski wrote: > Hello everyone, > This patchset adds support for DMABUF [2] importing to V4L2 stack. > The support for DMABUF exporting was moved to separate patchset > due to dependency on patches for DMA mapping redesign by > Marek Szyprowski [4]. Except for the small issue with patches 01/13 and 02/13, the set is ready for upstream as far as I'm concerned. > v6: > - fixed missing entry in v4l2_memory_names > - fixed a bug occuring after get_user_pages failure I've missed that one, what was it ? > - fixed a bug caused by using invalid vma for get_user_pages > - prepare/finish no longer call dma_sync for dmabuf buffers > > v5: > - removed change of importer/exporter behaviour > - fixes vb2_dc_pages_to_sgt basing on Laurent's hints > - changed pin/unpin words to lock/unlock in Doc > > v4: > - rebased on mainline 3.4-rc2 > - included missing importing support for s5p-fimc and s5p-tv > - added patch for changing map/unmap for importers > - fixes to Documentation part > - coding style fixes > - pairing {map/unmap}_dmabuf in vb2-core > - fixing variable types and semantic of arguments in videobufb2-dma-contig.c > > v3: > - rebased on mainline 3.4-rc1 > - split 'code refactor' patch to multiple smaller patches > - squashed fixes to Sumit's patches > - patchset is no longer dependant on 'DMA mapping redesign' > - separated path for handling IO and non-IO mappings > - add documentation for DMABUF importing to V4L > - removed all DMABUF exporter related code > - removed usage of dma_get_pages extension > > v2: > - extended VIDIOC_EXPBUF argument from integer memoffset to struct > v4l2_exportbuffer > - added patch that breaks DMABUF spec on (un)map_atachment callcacks but > allows to work with existing implementation of DMABUF prime in DRM > - all dma-contig code refactoring patches were squashed > - bugfixes > > v1: List of changes since [1]. > - support for DMA api extension dma_get_pages, the function is used to > retrieve pages used to create DMA mapping. > - small fixes/code cleanup to videobuf2 > - added prepare and finish callbacks to vb2 allocators, it is used keep > consistency between dma-cpu acess to the memory (by Marek Szyprowski) > - support for exporting of DMABUF buffer in V4L2 and Videobuf2, originated > from [3]. > - support for dma-buf exporting in vb2-dma-contig allocator > - support for DMABUF for s5p-tv and s5p-fimc (capture interface) drivers, > originated from [3] > - changed handling for userptr buffers (by Marek Szyprowski, Andrzej > Pietrasiewicz) > - let mmap method to use dma_mmap_writecombine call (by Marek Szyprowski) > > [1] > http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/4296 > 6/focus=42968 [2] https://lkml.org/lkml/2011/12/26/29 > [3] > http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/3635 > 4/focus=36355 [4] > http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819 > > Laurent Pinchart (2): > v4l: vb2-dma-contig: Shorten vb2_dma_contig prefix to vb2_dc > v4l: vb2-dma-contig: Reorder functions > > Marek Szyprowski (2): > v4l: vb2: add prepare/finish callbacks to allocators > v4l: vb2-dma-contig: add prepare/finish to dma-contig allocator > > Sumit Semwal (4): > v4l: Add DMABUF as a memory type > v4l: vb2: add support for shared buffer (dma_buf) > v4l: vb: remove warnings about MEMORY_DMABUF > v4l: vb2-dma-contig: add support for dma_buf importing > > Tomasz Stanislawski (5): > Documentation: media: description of DMABUF importing in V4L2 > v4l: vb2-dma-contig: Remove unneeded allocation context structure > v4l: vb2-dma-contig: add support for scatterlist in userptr mode > v4l: s5p-tv: mixer: support for dmabuf importing > v4l: s5p-fimc: support for dmabuf importing > > Documentation/DocBook/media/v4l/compat.xml | 4 + > Documentation/DocBook/media/v4l/io.xml | 179 +++++++ > .../DocBook/media/v4l/vidioc-create-bufs.xml | 1 + > Documentation/DocBook/media/v4l/vidioc-qbuf.xml | 15 + > Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | 45 +- > drivers/media/video/s5p-fimc/Kconfig | 1 + > drivers/media/video/s5p-fimc/fimc-capture.c | 2 +- > drivers/media/video/s5p-tv/Kconfig | 1 + > drivers/media/video/s5p-tv/mixer_video.c | 2 +- > drivers/media/video/v4l2-ioctl.c | 1 + > drivers/media/video/videobuf-core.c | 4 + > drivers/media/video/videobuf2-core.c | 207 +++++++- > drivers/media/video/videobuf2-dma-contig.c | 520 ++++++++++++++--- > include/linux/videodev2.h | 7 + > include/media/videobuf2-core.h | 34 ++ > 15 files changed, 924 insertions(+), 99 deletions(-) -- Regards, Laurent Pinchart From linux at arm.linux.org.uk Tue May 29 12:29:32 2012 From: linux at arm.linux.org.uk (Russell King - ARM Linux) Date: Tue, 29 May 2012 13:29:32 +0100 Subject: [Linaro-mm-sig] [GIT PULL] CMA and ARM DMA-mapping updates for v3.5 In-Reply-To: <1337672417-10065-1-git-send-email-m.szyprowski@samsung.com> References: <1337672417-10065-1-git-send-email-m.szyprowski@samsung.com> Message-ID: <20120529122932.GA24623@n2100.arm.linux.org.uk> I notice we have new warnings as a result of CMA being merged, though thankfully they're just in Kconfig: warning: (ARM) selects CMA which has unmet direct dependencies (HAVE_DMA_CONTIGUOUS && HAVE_MEMBLOCK && EXPERIMENTAL) This seems totally weird: you're mandating that ARM must have CMA selected, but it's an experimental feature? So you're implying that the entire ARM kernel becomes totally experimental for the next release cycle? I think this needs fixing. From m.szyprowski at samsung.com Tue May 29 14:50:45 2012 From: m.szyprowski at samsung.com (Marek Szyprowski) Date: Tue, 29 May 2012 16:50:45 +0200 Subject: [Linaro-mm-sig] [GIT PULL] CMA and ARM DMA-mapping updates for v3.5 In-Reply-To: <20120529122932.GA24623@n2100.arm.linux.org.uk> References: <1337672417-10065-1-git-send-email-m.szyprowski@samsung.com> <20120529122932.GA24623@n2100.arm.linux.org.uk> Message-ID: <015e01cd3daa$6d910e50$48b32af0$%szyprowski@samsung.com> Hello, On Tuesday, May 29, 2012 2:30 PM Russell King - ARM Linux wrote: > I notice we have new warnings as a result of CMA being merged, though > thankfully they're just in Kconfig: > > warning: (ARM) selects CMA which has unmet direct dependencies (HAVE_DMA_CONTIGUOUS && > HAVE_MEMBLOCK && EXPERIMENTAL) > > This seems totally weird: you're mandating that ARM must have CMA > selected, but it's an experimental feature? So you're implying that > the entire ARM kernel becomes totally experimental for the next > release cycle? > > I think this needs fixing. No, that wasn't my intention. I will provide a patch which removes unconditional dependency on CMA - it will let one to disable CMA and use old allocation method if needed, but this requires a few more changes in the dma-mapping implementation. I wasn't aware of the consequences and no one has complained about this since v15 of CMA patches (Aug 2011). Best regards -- Marek Szyprowski Samsung Poland R&D Center From kosaki.motohiro at gmail.com Wed May 30 00:11:09 2012 From: kosaki.motohiro at gmail.com (KOSAKI Motohiro) Date: Tue, 29 May 2012 20:11:09 -0400 Subject: [Linaro-mm-sig] [PATCHv2 4/4] ARM: dma-mapping: remove custom consistent dma region In-Reply-To: <1337252085-22039-5-git-send-email-m.szyprowski@samsung.com> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-5-git-send-email-m.szyprowski@samsung.com> Message-ID: <4FC5659D.6040805@gmail.com> > static void * > __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot, > const void *caller) > { > - struct arm_vmregion *c; > - size_t align; > - int bit; > + struct vm_struct *area; > + unsigned long addr; > > - if (!consistent_pte) { > - printk(KERN_ERR "%s: not initialised\n", __func__); > + area = get_vm_area_caller(size, VM_DMA | VM_USERMAP, caller); In this patch, VM_DMA is only used here. So, is this no effect? From konrad.wilk at oracle.com Tue May 29 15:07:14 2012 From: konrad.wilk at oracle.com (Konrad Rzeszutek Wilk) Date: Tue, 29 May 2012 11:07:14 -0400 Subject: [Linaro-mm-sig] [PATCHv2 3/4] mm: vmalloc: add VM_DMA flag to indicate areas used by dma-mapping framework In-Reply-To: <001d01cd3caa$a05d0510$e1170f30$%szyprowski@samsung.com> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-4-git-send-email-m.szyprowski@samsung.com> <4FBB3B41.8010102@kernel.org> <01e501cd39a8$67f34ea0$37d9ebe0$%szyprowski@samsung.com> <20120524122854.GD11860@linux-sh.org> <001d01cd3caa$a05d0510$e1170f30$%szyprowski@samsung.com> Message-ID: <20120529150714.GA8293@phenom.dumpdata.com> On Mon, May 28, 2012 at 10:19:39AM +0200, Marek Szyprowski wrote: > Hello, > > On Sunday, May 27, 2012 2:35 PM KOSAKI Motohiro wrote: > > > On Thu, May 24, 2012 at 8:28 AM, Paul Mundt wrote: > > > On Thu, May 24, 2012 at 02:26:12PM +0200, Marek Szyprowski wrote: > > >> On Tuesday, May 22, 2012 9:08 AM Minchan Kim wrote: > > >> > Hmm, VM_DMA would become generic flag? > > >> > AFAIU, maybe VM_DMA would be used only on ARM arch. > > >> > > >> Right now yes, it will be used only on ARM architecture, but maybe other architecture will > > >> start using it once it is available. > > >> > > > There's very little about the code in question that is ARM-specific to > > > begin with. I plan to adopt similar changes on SH once the work has > > > settled one way or the other, so we'll probably use the VMA flag there, > > > too. > > > > I don't think VM_DMA is good idea because x86_64 has two dma zones. x86 unaware > > patches make no sense. > > I see no problems to add VM_DMA64 later if x86_64 starts using vmalloc areas for creating > kernel mappings for the dma buffers (I assume that there are 2 dma zones: one 32bit and one > 64bit). Right now x86 and x86_64 don't use vmalloc areas for dma buffers, so I hardly see > how this patch can be considered as 'x86 unaware'. Well they do - kind off. It is usually done by calling vmalloc_32 and then using the DMA API on top of those pages (or sometimes the non-portable virt_to_phys macro). Introducing this and replacing the vmalloc_32 with this seems like a nice step in making those device drivers APIs more portable? From m.szyprowski at samsung.com Wed May 30 07:15:53 2012 From: m.szyprowski at samsung.com (Marek Szyprowski) Date: Wed, 30 May 2012 09:15:53 +0200 Subject: [Linaro-mm-sig] [PATCHv2 4/4] ARM: dma-mapping: remove custom consistent dma region In-Reply-To: <4FC5659D.6040805@gmail.com> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-5-git-send-email-m.szyprowski@samsung.com> <4FC5659D.6040805@gmail.com> Message-ID: <019401cd3e34$0c6af4d0$2540de70$%szyprowski@samsung.com> Hello, On Wednesday, May 30, 2012 2:11 AM KOSAKI Motohiro wrote: > > static void * > > __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot, > > const void *caller) > > { > > - struct arm_vmregion *c; > > - size_t align; > > - int bit; > > + struct vm_struct *area; > > + unsigned long addr; > > > > - if (!consistent_pte) { > > - printk(KERN_ERR "%s: not initialised\n", __func__); > > + area = get_vm_area_caller(size, VM_DMA | VM_USERMAP, caller); > > In this patch, VM_DMA is only used here. So, is this no effect? I introduced it mainly to let user know which areas have been allocated by the dma-mapping api. I also plan to add a check suggested by Minchan Kim in __dma_free_remap() if the vmalloc area have been in fact allocated with VM_DMA set. Best regards -- Marek Szyprowski Samsung Poland R&D Center From kosaki.motohiro at gmail.com Wed May 30 07:22:53 2012 From: kosaki.motohiro at gmail.com (KOSAKI Motohiro) Date: Wed, 30 May 2012 03:22:53 -0400 Subject: [Linaro-mm-sig] [PATCHv2 4/4] ARM: dma-mapping: remove custom consistent dma region In-Reply-To: <019401cd3e34$0c6af4d0$2540de70$%szyprowski@samsung.com> References: <1337252085-22039-1-git-send-email-m.szyprowski@samsung.com> <1337252085-22039-5-git-send-email-m.szyprowski@samsung.com> <4FC5659D.6040805@gmail.com> <019401cd3e34$0c6af4d0$2540de70$%szyprowski@samsung.com> Message-ID: <4FC5CACD.6000105@gmail.com> (5/30/12 3:15 AM), Marek Szyprowski wrote: > Hello, > > On Wednesday, May 30, 2012 2:11 AM KOSAKI Motohiro wrote: > >>> static void * >>> __dma_alloc_remap(struct page *page, size_t size, gfp_t gfp, pgprot_t prot, >>> const void *caller) >>> { >>> - struct arm_vmregion *c; >>> - size_t align; >>> - int bit; >>> + struct vm_struct *area; >>> + unsigned long addr; >>> >>> - if (!consistent_pte) { >>> - printk(KERN_ERR "%s: not initialised\n", __func__); >>> + area = get_vm_area_caller(size, VM_DMA | VM_USERMAP, caller); >> >> In this patch, VM_DMA is only used here. So, is this no effect? > > I introduced it mainly to let user know which areas have been allocated by the dma-mapping api. vma->flags are limited resource, it has only 32 (or 64) bits. Please don't use it for such unimportant thing. > I also plan to add a check suggested by Minchan Kim in __dma_free_remap() if the vmalloc area > have been in fact allocated with VM_DMA set. From m.szyprowski at samsung.com Wed May 30 08:59:51 2012 From: m.szyprowski at samsung.com (Marek Szyprowski) Date: Wed, 30 May 2012 10:59:51 +0200 Subject: [Linaro-mm-sig] [PATCH] ARM: dma-mapping: remove unconditional dependency on CMA In-Reply-To: <20120529122932.GA24623@n2100.arm.linux.org.uk> References: <20120529122932.GA24623@n2100.arm.linux.org.uk> Message-ID: <1338368391-25057-1-git-send-email-m.szyprowski@samsung.com> CMA has been enabled unconditionally on all ARMv6+ systems to solve the long standing issue of double kernel mappings for all dma coherent buffers. This however created a dependency on CONFIG_EXPERIMENTAL for the whole ARM architecture what should be really avoided. This patch removes this dependency and lets one use old, well-tested dma-mapping implementation also on ARMv6+ systems without the need to use EXPERIMENTAL stuff. Reported-by: Russell King Signed-off-by: Marek Szyprowski --- arch/arm/Kconfig | 1 - arch/arm/mm/dma-mapping.c | 10 ++++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 5e76013..ca7354f 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -7,7 +7,6 @@ config ARM select HAVE_IDE if PCI || ISA || PCMCIA select HAVE_DMA_ATTRS select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7) - select CMA if (CPU_V6 || CPU_V6K || CPU_V7) select HAVE_MEMBLOCK select RTC_LIB select SYS_SUPPORTS_APM_EMULATION diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c index ea6b431..106c4c0 100644 --- a/arch/arm/mm/dma-mapping.c +++ b/arch/arm/mm/dma-mapping.c @@ -268,10 +268,8 @@ static int __init consistent_init(void) unsigned long base = consistent_base; unsigned long num_ptes = (CONSISTENT_END - base) >> PMD_SHIFT; -#ifndef CONFIG_ARM_DMA_USE_IOMMU - if (cpu_architecture() >= CPU_ARCH_ARMv6) + if (IS_ENABLED(CONFIG_CMA) && !IS_ENABLED(CONFIG_ARM_DMA_USE_IOMMU)) return 0; -#endif consistent_pte = kmalloc(num_ptes * sizeof(pte_t), GFP_KERNEL); if (!consistent_pte) { @@ -342,7 +340,7 @@ static int __init coherent_init(void) struct page *page; void *ptr; - if (cpu_architecture() < CPU_ARCH_ARMv6) + if (!IS_ENABLED(CONFIG_CMA)) return 0; ptr = __alloc_from_contiguous(NULL, size, prot, &page); @@ -704,7 +702,7 @@ static void *__dma_alloc(struct device *dev, size_t size, dma_addr_t *handle, if (arch_is_coherent() || nommu()) addr = __alloc_simple_buffer(dev, size, gfp, &page); - else if (cpu_architecture() < CPU_ARCH_ARMv6) + else if (!IS_ENABLED(CONFIG_CMA)) addr = __alloc_remap_buffer(dev, size, gfp, prot, &page, caller); else if (gfp & GFP_ATOMIC) addr = __alloc_from_pool(dev, size, &page, caller); @@ -773,7 +771,7 @@ void arm_dma_free(struct device *dev, size_t size, void *cpu_addr, if (arch_is_coherent() || nommu()) { __dma_free_buffer(page, size); - } else if (cpu_architecture() < CPU_ARCH_ARMv6) { + } else if (!IS_ENABLED(CONFIG_CMA)) { __dma_free_remap(cpu_addr, size); __dma_free_buffer(page, size); } else { -- 1.7.1.569.g6f426 From sumit.semwal at ti.com Wed May 30 15:26:34 2012 From: sumit.semwal at ti.com (Semwal, Sumit) Date: Wed, 30 May 2012 23:26:34 +0800 Subject: [Linaro-mm-sig] [PATCHv6 00/13] Integration of videobuf2 with dmabuf In-Reply-To: <5090892.Z3RkLXNQ1U@avalon> References: <1337775027-9489-1-git-send-email-t.stanislaws@samsung.com> <5090892.Z3RkLXNQ1U@avalon> Message-ID: On Tue, May 29, 2012 at 6:25 AM, Laurent Pinchart wrote: > Hi Tomasz, Hi Tomasz, Laurent, Mauro, > > On Wednesday 23 May 2012 14:10:14 Tomasz Stanislawski wrote: >> Hello everyone, >> This patchset adds support for DMABUF [2] importing to V4L2 stack. >> The support for DMABUF exporting was moved to separate patchset >> due to dependency on patches for DMA mapping redesign by >> Marek Szyprowski [4]. > > Except for the small issue with patches 01/13 and 02/13, the set is ready for > upstream as far as I'm concerned. +1; Mauro: how do you think about this series? Getting it landed into 3.5 would make life lot easier :) > >> v6: >> - fixed missing entry in v4l2_memory_names >> - fixed a bug occuring after get_user_pages failure > > I've missed that one, what was it ? > >> - fixed a bug caused by using invalid vma for get_user_pages >> - prepare/finish no longer call dma_sync for dmabuf buffers >> >> v5: >> - removed change of importer/exporter behaviour >> - fixes vb2_dc_pages_to_sgt basing on Laurent's hints >> - changed pin/unpin words to lock/unlock in Doc >> >> v4: >> - rebased on mainline 3.4-rc2 >> - included missing importing support for s5p-fimc and s5p-tv >> - added patch for changing map/unmap for importers >> - fixes to Documentation part >> - coding style fixes >> - pairing {map/unmap}_dmabuf in vb2-core >> - fixing variable types and semantic of arguments in videobufb2-dma-contig.c >> >> v3: >> - rebased on mainline 3.4-rc1 >> - split 'code refactor' patch to multiple smaller patches >> - squashed fixes to Sumit's patches >> - patchset is no longer dependant on 'DMA mapping redesign' >> - separated path for handling IO and non-IO mappings >> - add documentation for DMABUF importing to V4L >> - removed all DMABUF exporter related code >> - removed usage of dma_get_pages extension >> >> v2: >> - extended VIDIOC_EXPBUF argument from integer memoffset to struct >> ? v4l2_exportbuffer >> - added patch that breaks DMABUF spec on (un)map_atachment callcacks but >> allows to work with existing implementation of DMABUF prime in DRM >> - all dma-contig code refactoring patches were squashed >> - bugfixes >> >> v1: List of changes since [1]. >> - support for DMA api extension dma_get_pages, the function is used to >> retrieve pages used to create DMA mapping. >> - small fixes/code cleanup to videobuf2 >> - added prepare and finish callbacks to vb2 allocators, it is used keep >> ? consistency between dma-cpu acess to the memory (by Marek Szyprowski) >> - support for exporting of DMABUF buffer in V4L2 and Videobuf2, originated >> from [3]. >> - support for dma-buf exporting in vb2-dma-contig allocator >> - support for DMABUF for s5p-tv and s5p-fimc (capture interface) drivers, >> ? originated from [3] >> - changed handling for userptr buffers (by Marek Szyprowski, Andrzej >> ? Pietrasiewicz) >> - let mmap method to use dma_mmap_writecombine call (by Marek Szyprowski) >> >> [1] >> http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/4296 >> 6/focus=42968 [2] https://lkml.org/lkml/2011/12/26/29 >> [3] >> http://thread.gmane.org/gmane.linux.drivers.video-input-infrastructure/3635 >> 4/focus=36355 [4] >> http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819 >> >> Laurent Pinchart (2): >> ? v4l: vb2-dma-contig: Shorten vb2_dma_contig prefix to vb2_dc >> ? v4l: vb2-dma-contig: Reorder functions >> >> Marek Szyprowski (2): >> ? v4l: vb2: add prepare/finish callbacks to allocators >> ? v4l: vb2-dma-contig: add prepare/finish to dma-contig allocator >> >> Sumit Semwal (4): >> ? v4l: Add DMABUF as a memory type >> ? v4l: vb2: add support for shared buffer (dma_buf) >> ? v4l: vb: remove warnings about MEMORY_DMABUF >> ? v4l: vb2-dma-contig: add support for dma_buf importing >> >> Tomasz Stanislawski (5): >> ? Documentation: media: description of DMABUF importing in V4L2 >> ? v4l: vb2-dma-contig: Remove unneeded allocation context structure >> ? v4l: vb2-dma-contig: add support for scatterlist in userptr mode >> ? v4l: s5p-tv: mixer: support for dmabuf importing >> ? v4l: s5p-fimc: support for dmabuf importing >> >> ?Documentation/DocBook/media/v4l/compat.xml ? ? ? ? | ? ?4 + >> ?Documentation/DocBook/media/v4l/io.xml ? ? ? ? ? ? | ?179 +++++++ >> ?.../DocBook/media/v4l/vidioc-create-bufs.xml ? ? ? | ? ?1 + >> ?Documentation/DocBook/media/v4l/vidioc-qbuf.xml ? ?| ? 15 + >> ?Documentation/DocBook/media/v4l/vidioc-reqbufs.xml | ? 45 +- >> ?drivers/media/video/s5p-fimc/Kconfig ? ? ? ? ? ? ? | ? ?1 + >> ?drivers/media/video/s5p-fimc/fimc-capture.c ? ? ? ?| ? ?2 +- >> ?drivers/media/video/s5p-tv/Kconfig ? ? ? ? ? ? ? ? | ? ?1 + >> ?drivers/media/video/s5p-tv/mixer_video.c ? ? ? ? ? | ? ?2 +- >> ?drivers/media/video/v4l2-ioctl.c ? ? ? ? ? ? ? ? ? | ? ?1 + >> ?drivers/media/video/videobuf-core.c ? ? ? ? ? ? ? ?| ? ?4 + >> ?drivers/media/video/videobuf2-core.c ? ? ? ? ? ? ? | ?207 +++++++- >> ?drivers/media/video/videobuf2-dma-contig.c ? ? ? ? | ?520 ++++++++++++++--- >> ?include/linux/videodev2.h ? ? ? ? ? ? ? ? ? ? ? ? ?| ? ?7 + >> ?include/media/videobuf2-core.h ? ? ? ? ? ? ? ? ? ? | ? 34 ++ >> ?15 files changed, 924 insertions(+), 99 deletions(-) > -- > Regards, > > Laurent Pinchart > Best regards, ~Sumit.