]> rtime.felk.cvut.cz Git - sojka/nv-tegra/linux-3.10.git/commitdiff
video: tegra: nvmap: Remove direct access to priv
authorArto Merilainen <amerilainen@nvidia.com>
Tue, 25 Feb 2014 12:52:58 +0000 (14:52 +0200)
committerTerje Bergstrom <tbergstrom@nvidia.com>
Thu, 27 Feb 2014 06:36:14 +0000 (22:36 -0800)
nvmap allows accessing the driver private data through dmabuf *and*
directly using nvmap global function calls. This patch removes the
direct path.

Bug 1450489

Change-Id: I25ec754e2f1f298c8d4fb8cfd66ca78cedb132c8
Signed-off-by: Arto Merilainen <amerilainen@nvidia.com>
Reviewed-on: http://git-master/r/374268
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
drivers/video/tegra/nvmap/nvmap_dmabuf.c
include/linux/nvmap.h

index 9723d8578af655c8e15918de94aeb02fcb2dd027..27012bc126190c3bf9da68ab7c7211aec71ec792 100644 (file)
@@ -766,38 +766,6 @@ void nvmap_dmabuf_free_sg_table(struct dma_buf *dmabuf, struct sg_table *sgt)
        __nvmap_free_sg_table(NULL, NULL, sgt);
 }
 
-void nvmap_set_dmabuf_private(struct dma_buf *dmabuf, void *priv,
-               void (*delete)(void *priv))
-{
-       struct nvmap_handle_info *info;
-
-       if (WARN_ON(dmabuf->ops != &nvmap_dma_buf_ops))
-               return;
-
-       if (WARN_ON(!virt_addr_valid(dmabuf)))
-               return;
-
-       info = dmabuf->priv;
-       info->handle->nvhost_priv = priv;
-       info->handle->nvhost_priv_delete = delete;
-}
-
-void *nvmap_get_dmabuf_private(struct dma_buf *dmabuf)
-{
-       void *priv;
-       struct nvmap_handle_info *info;
-
-       if (WARN_ON(dmabuf->ops != &nvmap_dma_buf_ops))
-               return NULL;
-
-       if (WARN_ON(!virt_addr_valid(dmabuf)))
-               return ERR_PTR(-EINVAL);
-
-       info = dmabuf->priv;
-       priv = info->handle->nvhost_priv;
-       return priv;
-}
-
 /*
  * List detailed info for all buffers allocated.
  */
index cd3e1ae78d961f9c1a13741d7b0305dfcb255d5e..72c162c94a74d87146bb955b86a8ff80e049d6c0 100644 (file)
@@ -69,11 +69,6 @@ struct sg_table *nvmap_dmabuf_sg_table(struct dma_buf *dmabuf);
 
 void nvmap_dmabuf_free_sg_table(struct dma_buf *dmabuf, struct sg_table *sgt);
 
-void nvmap_set_dmabuf_private(struct dma_buf *dmabuf, void *priv,
-                             void (*delete)(void *priv));
-
-void *nvmap_get_dmabuf_private(struct dma_buf *dmabuf);
-
 int nvmap_get_dmabuf_param(struct dma_buf *dmabuf, u32 param, u64 *result);
 
 #ifdef CONFIG_NVMAP_PAGE_POOLS