video: tegra: host: Add dmabuf support

Change-Id: I316fc5b8cc748b29e4f9776e27610d7468682311
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: http://git-master/r/139302
Reviewed-by: Juha Tukkinen <jtukkinen@nvidia.com>
Tested-by: Juha Tukkinen <jtukkinen@nvidia.com>

Rebase-Id: Rfe7ff7cabace52a9d9c75bcd7f5f768017367ff8

5 files changed, 184 insertions, 0 deletions

diff --git a/drivers/video/tegra/host/Makefile b/drivers/video/tegra/host/Makefile
index 17e919d68..8aaf2365f 100644
--- a/drivers/video/tegra/host/Makefile
+++ b/drivers/video/tegra/host/Makefile
@@ -28,3 +28,4 @@ obj-$(CONFIG_TEGRA_GRHOST) += tsec/
 obj-$(CONFIG_TEGRA_GRHOST) += nvhost.o
 
 obj-$(CONFIG_TEGRA_GRHOST_USE_NVMAP) += nvmap.o
+obj-$(CONFIG_TEGRA_GRHOST_USE_DMABUF) += dmabuf.o
diff --git a/drivers/video/tegra/host/dmabuf.c b/drivers/video/tegra/host/dmabuf.c
new file mode 100644
index 000000000..68554b0df
--- /dev/null
+++ b/drivers/video/tegra/host/dmabuf.c
@@ -0,0 +1,87 @@
+/*
+ * drivers/video/tegra/host/dmabuf.c
+ *
+ * Tegra Graphics Host DMA-BUF support
+ *
+ * Copyright (c) 2012, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include <linux/dma-buf.h>
+#include <linux/nvhost.h>
+#include "chip_support.h"
+#include "nvhost_memmgr.h"
+
+static inline struct dma_buf_attachment *to_dmabuf_att(struct mem_handle *h)
+{
+        return (struct dma_buf_attachment *)(((u32)h) & ~0x3);
+}
+
+static inline struct dma_buf *to_dmabuf(struct mem_handle *h)
+{
+        return to_dmabuf_att(h)->dmabuf;
+}
+
+static inline int to_dmabuf_fd(u32 id)
+{
+        return nvhost_memmgr_id(id) >> 2;
+}
+struct mem_handle *nvhost_dmabuf_alloc(size_t size, size_t align, int flags)
+{
+        /* TODO: Add allocation via DMA Mapping API */
+        return NULL;
+}
+
+void nvhost_dmabuf_put(struct mem_handle *handle)
+{
+        dma_buf_put(to_dmabuf(handle));
+}
+
+struct sg_table *nvhost_dmabuf_pin(struct mem_handle *handle)
+{
+        return dma_buf_map_attachment(to_dmabuf_att(handle),
+                                DMA_BIDIRECTIONAL);
+}
+
+void nvhost_dmabuf_unpin(struct mem_handle *handle, struct sg_table *sgt)
+{
+        dma_buf_unmap_attachment(to_dmabuf_att(handle), sgt, DMA_BIDIRECTIONAL);
+}
+
+void *nvhost_dmabuf_mmap(struct mem_handle *handle)
+{
+        return dma_buf_vmap(to_dmabuf(handle));
+}
+
+void nvhost_dmabuf_munmap(struct mem_handle *handle, void *addr)
+{
+        dma_buf_vunmap(to_dmabuf(handle), addr);
+}
+
+struct mem_handle *nvhost_dmabuf_get(u32 id, struct nvhost_device *dev)
+{
+        struct mem_handle *h;
+        struct dma_buf *buf;
+
+        buf = dma_buf_get(to_dmabuf_fd(id));
+        if (IS_ERR_OR_NULL(buf))
+                return (struct mem_handle *)buf;
+        else {
+                h = (struct mem_handle *)dma_buf_attach(buf, &dev->dev);
+                if (IS_ERR_OR_NULL(h))
+                        dma_buf_put(buf);
+        }
+
+        return (struct mem_handle *) ((u32)h | mem_mgr_type_dmabuf);
+}
diff --git a/drivers/video/tegra/host/dmabuf.h b/drivers/video/tegra/host/dmabuf.h
new file mode 100644
index 000000000..0beb1d6b1
--- /dev/null
+++ b/drivers/video/tegra/host/dmabuf.h
@@ -0,0 +1,42 @@
+/*
+ * drivers/video/tegra/host/dmabuf.h
+ *
+ * Tegra Graphics Host dmabuf memory manager
+ *
+ * Copyright (c) 2012, NVIDIA Corporation.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU General Public License,
+ * version 2, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef __NVHOST_DMABUF_H
+#define __NVHOST_DMABUF_H
+
+#include "nvhost_memmgr.h"
+
+struct nvhost_chip_support;
+struct nvhost_device;
+
+struct mem_mgr *nvhost_dmabuf_alloc_mgr(void);
+void nvhost_dmabuf_put_mgr(struct mem_mgr *mgr);
+struct mem_mgr *nvhost_dmabuf_get_mgr(struct mem_mgr *mgr);
+struct mem_mgr *nvhost_dmabuf_get_mgr_file(int fd);
+struct mem_handle *nvhost_dmabuf_alloc(struct mem_mgr *mgr,
+                size_t size, size_t align, int flags);
+void nvhost_dmabuf_put(struct mem_handle *handle);
+struct sg_table *nvhost_dmabuf_pin(struct mem_handle *handle);
+void nvhost_dmabuf_unpin(struct mem_handle *handle, struct sg_table *sgt);
+void *nvhost_dmabuf_mmap(struct mem_handle *handle);
+void nvhost_dmabuf_munmap(struct mem_handle *handle, void *addr);
+int nvhost_dmabuf_get(u32 id, struct nvhost_device *dev);
+
+#endif
diff --git a/drivers/video/tegra/host/nvhost_memmgr.c b/drivers/video/tegra/host/nvhost_memmgr.c
index 8358f0c69..861cd8cdd 100644
--- a/drivers/video/tegra/host/nvhost_memmgr.c
+++ b/drivers/video/tegra/host/nvhost_memmgr.c
@@ -25,6 +25,9 @@
 #ifdef CONFIG_TEGRA_GRHOST_USE_NVMAP
 #include "nvmap.h"
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+#include "dmabuf.h"
+#endif
 #include "chip_support.h"
 
 struct mem_mgr *nvhost_memmgr_alloc_mgr(void)
@@ -32,6 +35,10 @@ struct mem_mgr *nvhost_memmgr_alloc_mgr(void)
         struct mem_mgr *mgr = NULL;
 #ifdef CONFIG_TEGRA_GRHOST_USE_NVMAP
         mgr = nvhost_nvmap_alloc_mgr();
+#else
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        mgr = (struct mem_mgr)1;
+#endif
 #endif
 
         return mgr;
@@ -41,6 +48,10 @@ void nvhost_memmgr_put_mgr(struct mem_mgr *mgr)
 {
 #ifdef CONFIG_TEGRA_GRHOST_USE_NVMAP
         nvhost_nvmap_put_mgr(mgr);
+#else
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        mgr = (struct mem_mgr)1;
+#endif
 #endif
 }
 
@@ -49,6 +60,10 @@ struct mem_mgr *nvhost_memmgr_get_mgr(struct mem_mgr *_mgr)
         struct mem_mgr *mgr = NULL;
 #ifdef CONFIG_TEGRA_GRHOST_USE_NVMAP
         mgr = nvhost_nvmap_get_mgr(_mgr);
+#else
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        mgr = (struct mem_mgr)1;
+#endif
 #endif
 
         return mgr;
@@ -59,6 +74,10 @@ struct mem_mgr *nvhost_memmgr_get_mgr_file(int fd)
         struct mem_mgr *mgr = NULL;
 #ifdef CONFIG_TEGRA_GRHOST_USE_NVMAP
         mgr = nvhost_nvmap_get_mgr_file(fd);
+#else
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        mgr = (struct mem_mgr)1;
+#endif
 #endif
 
         return mgr;
@@ -70,6 +89,10 @@ struct mem_handle *nvhost_memmgr_alloc(struct mem_mgr *mgr,
         struct mem_handle *h = NULL;
 #ifdef CONFIG_TEGRA_GRHOST_USE_NVMAP
         h = nvhost_nvmap_alloc(mgr, size, align, flags);
+#else
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        h = nvhost_dmabuf_alloc(mgr, size, align, flags);
+#endif
 #endif
 
         return h;
@@ -86,6 +109,11 @@ struct mem_handle *nvhost_memmgr_get(struct mem_mgr *mgr,
                 h = (struct mem_handle *) nvhost_nvmap_get(mgr, id, dev);
                 break;
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        case mem_mgr_type_dmabuf:
+                h = (struct mem_handle *) nvhost_dmabuf_get(id, dev);
+                break;
+#endif
         default:
                 break;
         }
@@ -101,6 +129,11 @@ void nvhost_memmgr_put(struct mem_mgr *mgr, struct mem_handle *handle)
                 nvhost_nvmap_put(mgr, handle);
                 break;
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        case mem_mgr_type_dmabuf:
+                nvhost_dmabuf_put(handle);
+                break;
+#endif
         default:
                 break;
         }
@@ -115,6 +148,11 @@ struct sg_table *nvhost_memmgr_pin(struct mem_mgr *mgr,
                 return nvhost_nvmap_pin(mgr, handle);
                 break;
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        case mem_mgr_type_dmabuf:
+                return nvhost_dmabuf_pin(handle);
+                break;
+#endif
         default:
                 return 0;
                 break;
@@ -130,6 +168,11 @@ void nvhost_memmgr_unpin(struct mem_mgr *mgr,
                 nvhost_nvmap_unpin(mgr, handle, sgt);
                 break;
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        case mem_mgr_type_dmabuf:
+                nvhost_dmabuf_unpin(handle, sgt);
+                break;
+#endif
         default:
                 break;
         }
@@ -143,6 +186,11 @@ void *nvhost_memmgr_mmap(struct mem_handle *handle)
                 return nvhost_nvmap_mmap(handle);
                 break;
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        case mem_mgr_type_dmabuf:
+                return nvhost_dmabuf_mmap(handle);
+                break;
+#endif
         default:
                 return 0;
                 break;
@@ -157,6 +205,11 @@ void nvhost_memmgr_munmap(struct mem_handle *handle, void *addr)
                 nvhost_nvmap_munmap(handle, addr);
                 break;
 #endif
+#ifdef CONFIG_TEGRA_GRHOST_USE_DMABUF
+        case mem_mgr_type_dmabuf:
+                nvhost_dmabuf_munmap(handle, addr);
+                break;
+#endif
         default:
                 break;
         }
diff --git a/drivers/video/tegra/host/nvhost_memmgr.h b/drivers/video/tegra/host/nvhost_memmgr.h
index cfdde6db5..407a085e6 100644
--- a/drivers/video/tegra/host/nvhost_memmgr.h
+++ b/drivers/video/tegra/host/nvhost_memmgr.h
@@ -33,6 +33,7 @@ enum mem_mgr_flag {
 
 enum mem_mgr_type {
         mem_mgr_type_nvmap = 0,
+        mem_mgr_type_dmabuf = 1,
 };
 
 int nvhost_memmgr_init(struct nvhost_chip_support *chip);