diff options
Diffstat (limited to 'drivers/gpu')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vm.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c index c2d80e2d..4fa01855 100644 --- a/drivers/gpu/nvgpu/common/linux/vm.c +++ b/drivers/gpu/nvgpu/common/linux/vm.c | |||
@@ -188,7 +188,7 @@ u64 nvgpu_vm_map(struct vm_gk20a *vm, | |||
188 | struct gk20a *g = gk20a_from_vm(vm); | 188 | struct gk20a *g = gk20a_from_vm(vm); |
189 | struct gk20a_comptag_allocator *ctag_allocator = &g->gr.comp_tags; | 189 | struct gk20a_comptag_allocator *ctag_allocator = &g->gr.comp_tags; |
190 | struct nvgpu_mapped_buf *mapped_buffer = NULL; | 190 | struct nvgpu_mapped_buf *mapped_buffer = NULL; |
191 | bool inserted = false, va_allocated = false; | 191 | bool va_allocated = false; |
192 | u64 map_offset = 0; | 192 | u64 map_offset = 0; |
193 | int err = 0; | 193 | int err = 0; |
194 | struct buffer_attrs bfr = {NULL}; | 194 | struct buffer_attrs bfr = {NULL}; |
@@ -372,7 +372,6 @@ u64 nvgpu_vm_map(struct vm_gk20a *vm, | |||
372 | nvgpu_err(g, "failed to insert into mapped buffer tree"); | 372 | nvgpu_err(g, "failed to insert into mapped buffer tree"); |
373 | goto clean_up; | 373 | goto clean_up; |
374 | } | 374 | } |
375 | inserted = true; | ||
376 | if (user_mapped) | 375 | if (user_mapped) |
377 | vm->num_user_mapped_buffers++; | 376 | vm->num_user_mapped_buffers++; |
378 | 377 | ||
@@ -387,11 +386,6 @@ u64 nvgpu_vm_map(struct vm_gk20a *vm, | |||
387 | return map_offset; | 386 | return map_offset; |
388 | 387 | ||
389 | clean_up: | 388 | clean_up: |
390 | if (inserted) { | ||
391 | nvgpu_remove_mapped_buf(vm, mapped_buffer); | ||
392 | if (user_mapped) | ||
393 | vm->num_user_mapped_buffers--; | ||
394 | } | ||
395 | nvgpu_kfree(g, mapped_buffer); | 389 | nvgpu_kfree(g, mapped_buffer); |
396 | if (va_allocated) | 390 | if (va_allocated) |
397 | __nvgpu_vm_free_va(vm, map_offset, bfr.pgsz_idx); | 391 | __nvgpu_vm_free_va(vm, map_offset, bfr.pgsz_idx); |