From 9d26da70be6b7babafc0a8199aa38b4f60c980d9 Mon Sep 17 00:00:00 2001 From: Deepak Nibade Date: Tue, 16 Feb 2016 15:36:32 +0530 Subject: 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 Reviewed-on: http://git-master/r/1012239 GVS: Gerrit_Virtual_Submit Reviewed-by: Amit Sharma (SW-TEGRA) Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'drivers') 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: } -static int gk20a_dmabuf_get_kind(struct dma_buf *dmabuf) -{ - int kind = 0; -#ifdef CONFIG_TEGRA_NVMAP - int err; - u64 nvmap_param; - - err = nvmap_get_dmabuf_param(dmabuf, NVMAP_HANDLE_PARAM_KIND, - &nvmap_param); - kind = err ? kind : nvmap_param; -#endif - return kind; -} - int gk20a_vm_map_buffer(struct vm_gk20a *vm, int dmabuf_fd, u64 *offset_align, @@ -3312,9 +3298,6 @@ int gk20a_vm_map_buffer(struct vm_gk20a *vm, return err; } - if (kind == -1) - kind = gk20a_dmabuf_get_kind(dmabuf); - ret_va = gk20a_vm_map(vm, dmabuf, *offset_align, flags, kind, NULL, true, gk20a_mem_flag_none, -- cgit v1.2.2