[PATCH v3 04/14] v4l: ti-vpe: Allow DMABUF buffer type support

2014-03-11 Thread Archit Taneja
For OMAP and DRA7x, we generally allocate video and graphics buffers through
omapdrm since the corresponding omap-gem driver provides DMM-Tiler backed
contiguous buffers. omapdrm is a dma-buf exporter. These buffers are used by
other drivers in the video pipeline.

Add VB2_DMABUF flag to the io_modes of the vb2 output and capture queues. This
allows the driver to import dma shared buffers.

Signed-off-by: Archit Taneja arc...@ti.com
---
 drivers/media/platform/ti-vpe/vpe.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/media/platform/ti-vpe/vpe.c 
b/drivers/media/platform/ti-vpe/vpe.c
index 0363df6..0e7573a 100644
--- a/drivers/media/platform/ti-vpe/vpe.c
+++ b/drivers/media/platform/ti-vpe/vpe.c
@@ -1770,7 +1770,7 @@ static int queue_init(void *priv, struct vb2_queue 
*src_vq,
 
memset(src_vq, 0, sizeof(*src_vq));
src_vq-type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
-   src_vq-io_modes = VB2_MMAP;
+   src_vq-io_modes = VB2_MMAP | VB2_DMABUF;
src_vq-drv_priv = ctx;
src_vq-buf_struct_size = sizeof(struct v4l2_m2m_buffer);
src_vq-ops = vpe_qops;
@@ -1783,7 +1783,7 @@ static int queue_init(void *priv, struct vb2_queue 
*src_vq,
 
memset(dst_vq, 0, sizeof(*dst_vq));
dst_vq-type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
-   dst_vq-io_modes = VB2_MMAP;
+   dst_vq-io_modes = VB2_MMAP | VB2_DMABUF;
dst_vq-drv_priv = ctx;
dst_vq-buf_struct_size = sizeof(struct v4l2_m2m_buffer);
dst_vq-ops = vpe_qops;
-- 
1.8.3.2

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH v3 04/14] v4l: ti-vpe: Allow DMABUF buffer type support

2014-03-11 Thread Hans Verkuil
On 03/11/14 09:33, Archit Taneja wrote:
 For OMAP and DRA7x, we generally allocate video and graphics buffers through
 omapdrm since the corresponding omap-gem driver provides DMM-Tiler backed
 contiguous buffers. omapdrm is a dma-buf exporter. These buffers are used by
 other drivers in the video pipeline.
 
 Add VB2_DMABUF flag to the io_modes of the vb2 output and capture queues. This
 allows the driver to import dma shared buffers.
 
 Signed-off-by: Archit Taneja arc...@ti.com

Reviewed-by: Hans Verkuil hans.verk...@cisco.com

 ---
  drivers/media/platform/ti-vpe/vpe.c | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/drivers/media/platform/ti-vpe/vpe.c 
 b/drivers/media/platform/ti-vpe/vpe.c
 index 0363df6..0e7573a 100644
 --- a/drivers/media/platform/ti-vpe/vpe.c
 +++ b/drivers/media/platform/ti-vpe/vpe.c
 @@ -1770,7 +1770,7 @@ static int queue_init(void *priv, struct vb2_queue 
 *src_vq,
  
   memset(src_vq, 0, sizeof(*src_vq));
   src_vq-type = V4L2_BUF_TYPE_VIDEO_OUTPUT_MPLANE;
 - src_vq-io_modes = VB2_MMAP;
 + src_vq-io_modes = VB2_MMAP | VB2_DMABUF;
   src_vq-drv_priv = ctx;
   src_vq-buf_struct_size = sizeof(struct v4l2_m2m_buffer);
   src_vq-ops = vpe_qops;
 @@ -1783,7 +1783,7 @@ static int queue_init(void *priv, struct vb2_queue 
 *src_vq,
  
   memset(dst_vq, 0, sizeof(*dst_vq));
   dst_vq-type = V4L2_BUF_TYPE_VIDEO_CAPTURE_MPLANE;
 - dst_vq-io_modes = VB2_MMAP;
 + dst_vq-io_modes = VB2_MMAP | VB2_DMABUF;
   dst_vq-drv_priv = ctx;
   dst_vq-buf_struct_size = sizeof(struct v4l2_m2m_buffer);
   dst_vq-ops = vpe_qops;
 

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html