summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDeepak Nibade <dnibade@nvidia.com>2016-02-16 05:06:32 -0500
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-02-16 12:22:19 -0500
commit9d26da70be6b7babafc0a8199aa38b4f60c980d9 (patch)
tree38d6eb43d0d645430b2b10b9f607ef43df33dc99 /drivers
parentd4a2cd5c66eaa3a9eb0ad3e8281b2864cf360844 (diff)
gpu: nvgpu: skip extracting kind from nvmap
While mapping the buffer, if kind argument is -1, we extract kind value from nvmap but kind information from nvmap is going away and hence remove respective call to nvmap Bug 1616899 Change-Id: I2764655f60df691ac8a86484c6ec929d2b83b2e3 Signed-off-by: Deepak Nibade <dnibade@nvidia.com> Reviewed-on: http://git-master/r/1012239 GVS: Gerrit_Virtual_Submit Reviewed-by: Amit Sharma (SW-TEGRA) <amisharma@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mm_gk20a.c17
1 files changed, 0 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index e79cc1d1..52529c39 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -3269,20 +3269,6 @@ out:
3269 3269
3270} 3270}
3271 3271
3272static int gk20a_dmabuf_get_kind(struct dma_buf *dmabuf)
3273{
3274 int kind = 0;
3275#ifdef CONFIG_TEGRA_NVMAP
3276 int err;
3277 u64 nvmap_param;
3278
3279 err = nvmap_get_dmabuf_param(dmabuf, NVMAP_HANDLE_PARAM_KIND,
3280 &nvmap_param);
3281 kind = err ? kind : nvmap_param;
3282#endif
3283 return kind;
3284}
3285
3286int gk20a_vm_map_buffer(struct vm_gk20a *vm, 3272int gk20a_vm_map_buffer(struct vm_gk20a *vm,
3287 int dmabuf_fd, 3273 int dmabuf_fd,
3288 u64 *offset_align, 3274 u64 *offset_align,
@@ -3312,9 +3298,6 @@ int gk20a_vm_map_buffer(struct vm_gk20a *vm,
3312 return err; 3298 return err;
3313 } 3299 }
3314 3300
3315 if (kind == -1)
3316 kind = gk20a_dmabuf_get_kind(dmabuf);
3317
3318 ret_va = gk20a_vm_map(vm, dmabuf, *offset_align, 3301 ret_va = gk20a_vm_map(vm, dmabuf, *offset_align,
3319 flags, kind, NULL, true, 3302 flags, kind, NULL, true,
3320 gk20a_mem_flag_none, 3303 gk20a_mem_flag_none,