82 lines
2.4 KiB
Diff
82 lines
2.4 KiB
Diff
From a47cabb4e0626125ea91fa25616e449705e1e783 Mon Sep 17 00:00:00 2001
|
|
From: Thierry Escande <thierry.escande@collabora.com>
|
|
Date: Wed, 26 Oct 2016 10:52:05 +0200
|
|
Subject: [PATCH 06/25] MEMEKA: videobuf2-dc: Move vb2_dc_get_base_sgt() above
|
|
mmap callbacks
|
|
|
|
This patch moves vb2_dc_get_base_sgt() function above mmap buffers
|
|
callbacks, particularly vb2_dc_alloc() and vb2_dc_mmap() from where it
|
|
will be called for cacheable MMAP support introduced in the next patch.
|
|
|
|
Signed-off-by: Thierry Escande <thierry.escande@collabora.com>
|
|
Signed-off-by: memeka <mihailescu2m@gmail.com>
|
|
---
|
|
.../common/videobuf2/videobuf2-dma-contig.c | 44 +++++++++----------
|
|
1 file changed, 22 insertions(+), 22 deletions(-)
|
|
|
|
diff --git a/drivers/media/common/videobuf2/videobuf2-dma-contig.c b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
index f4b4a7c135eb..8accf13fe439 100644
|
|
--- a/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
+++ b/drivers/media/common/videobuf2/videobuf2-dma-contig.c
|
|
@@ -62,6 +62,28 @@ static unsigned long vb2_dc_get_contiguous_size(struct sg_table *sgt)
|
|
return size;
|
|
}
|
|
|
|
+static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf)
|
|
+{
|
|
+ int ret;
|
|
+ struct sg_table *sgt;
|
|
+
|
|
+ sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
|
|
+ if (!sgt) {
|
|
+ dev_err(buf->dev, "failed to alloc sg table\n");
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ ret = dma_get_sgtable_attrs(buf->dev, sgt, buf->cookie, buf->dma_addr,
|
|
+ buf->size, buf->attrs);
|
|
+ if (ret < 0) {
|
|
+ dev_err(buf->dev, "failed to get scatterlist from DMA API\n");
|
|
+ kfree(sgt);
|
|
+ return NULL;
|
|
+ }
|
|
+
|
|
+ return sgt;
|
|
+}
|
|
+
|
|
/*********************************************/
|
|
/* callbacks for all buffers */
|
|
/*********************************************/
|
|
@@ -358,28 +380,6 @@ static const struct dma_buf_ops vb2_dc_dmabuf_ops = {
|
|
.release = vb2_dc_dmabuf_ops_release,
|
|
};
|
|
|
|
-static struct sg_table *vb2_dc_get_base_sgt(struct vb2_dc_buf *buf)
|
|
-{
|
|
- int ret;
|
|
- struct sg_table *sgt;
|
|
-
|
|
- sgt = kmalloc(sizeof(*sgt), GFP_KERNEL);
|
|
- if (!sgt) {
|
|
- dev_err(buf->dev, "failed to alloc sg table\n");
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- ret = dma_get_sgtable_attrs(buf->dev, sgt, buf->cookie, buf->dma_addr,
|
|
- buf->size, buf->attrs);
|
|
- if (ret < 0) {
|
|
- dev_err(buf->dev, "failed to get scatterlist from DMA API\n");
|
|
- kfree(sgt);
|
|
- return NULL;
|
|
- }
|
|
-
|
|
- return sgt;
|
|
-}
|
|
-
|
|
static struct dma_buf *vb2_dc_get_dmabuf(void *buf_priv, unsigned long flags)
|
|
{
|
|
struct vb2_dc_buf *buf = buf_priv;
|
|
--
|
|
2.17.1
|
|
|