From b70bad4b9f40e94f731fd9d509e1f3f6617f0b05 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Wed, 26 Apr 2017 14:27:02 -0700 Subject: gpu: nvgpu: Refactor gk20a_vm_alloc_va() This function is an internal function to the VM manager that allocates virtual memory space in the GVA allocator. It is unfortunately used in the vGPU code, though. In any event, this patch cleans up and moves the implementation of these functions into the VM common code. JIRA NVGPU-12 JIRA NVGPU-30 Change-Id: I24a3d29b5fcb12615df27d2ac82891d1bacfe541 Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1477745 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/vm.c | 2 +- drivers/gpu/nvgpu/common/mm/vm.c | 48 +++++++++++++++++++++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu/common') diff --git a/drivers/gpu/nvgpu/common/linux/vm.c b/drivers/gpu/nvgpu/common/linux/vm.c index 5470d9ee..9238a9df 100644 --- a/drivers/gpu/nvgpu/common/linux/vm.c +++ b/drivers/gpu/nvgpu/common/linux/vm.c @@ -394,7 +394,7 @@ clean_up: } nvgpu_kfree(g, mapped_buffer); if (va_allocated) - gk20a_vm_free_va(vm, map_offset, bfr.size, bfr.pgsz_idx); + __nvgpu_vm_free_va(vm, map_offset, bfr.pgsz_idx); if (!IS_ERR(bfr.sgt)) gk20a_mm_unpin(g->dev, dmabuf, bfr.sgt); diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c index 3bdc905e..3b3b7a10 100644 --- a/drivers/gpu/nvgpu/common/mm/vm.c +++ b/drivers/gpu/nvgpu/common/mm/vm.c @@ -29,6 +29,54 @@ int vm_aspace_id(struct vm_gk20a *vm) return vm->as_share ? vm->as_share->id : -1; } +u64 __nvgpu_vm_alloc_va(struct vm_gk20a *vm, u64 size, + enum gmmu_pgsz_gk20a pgsz_idx) + +{ + struct gk20a *g = vm->mm->g; + struct nvgpu_allocator *vma = NULL; + u64 addr; + u64 page_size = vm->gmmu_page_sizes[pgsz_idx]; + + vma = vm->vma[pgsz_idx]; + + if (pgsz_idx >= gmmu_nr_page_sizes) { + nvgpu_err(g, "(%s) invalid page size requested", vma->name); + return 0; + } + + if ((pgsz_idx == gmmu_page_size_big) && !vm->big_pages) { + nvgpu_err(g, "(%s) unsupportd page size requested", vma->name); + return 0; + } + + /* Be certain we round up to page_size if needed */ + size = (size + ((u64)page_size - 1)) & ~((u64)page_size - 1); + nvgpu_log(g, gpu_dbg_map, "size=0x%llx @ pgsz=%dKB", size, + vm->gmmu_page_sizes[pgsz_idx] >> 10); + + addr = nvgpu_alloc(vma, size); + if (!addr) { + nvgpu_err(g, "(%s) oom: sz=0x%llx", vma->name, size); + return 0; + } + + nvgpu_log(g, gpu_dbg_map, "(%s) addr: 0x%llx", vma->name, addr); + return addr; +} + +int __nvgpu_vm_free_va(struct vm_gk20a *vm, u64 addr, + enum gmmu_pgsz_gk20a pgsz_idx) +{ + struct gk20a *g = vm->mm->g; + struct nvgpu_allocator *vma = vm->vma[pgsz_idx]; + + nvgpu_log(g, gpu_dbg_map, "(%s) addr: 0x%llx", vma->name, addr); + nvgpu_free(vma, addr); + + return 0; +} + void nvgpu_vm_mapping_batch_start(struct vm_gk20a_mapping_batch *mapping_batch) { memset(mapping_batch, 0, sizeof(*mapping_batch)); -- cgit v1.2.2