gpu: nvgpu: Separate GMMU mapping impl from mm_gk20a.c

Separate the non-chip specific GMMU mapping implementation code
out of mm_gk20a.c. This puts all of the chip-agnostic code into
common/mm/gmmu.c in preparation for rewriting it.

JIRA NVGPU-12
JIRA NVGPU-30

Change-Id: I6f7fdac3422703f5e80bb22ad304dc27bba4814d
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1480228
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 19 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/common/mm/vm.c b/drivers/gpu/nvgpu/common/mm/vm.c
index e24d40bf..5ba386c9 100644
--- a/drivers/gpu/nvgpu/common/mm/vm.c
+++ b/drivers/gpu/nvgpu/common/mm/vm.c
@@ -18,6 +18,7 @@
 #include <nvgpu/dma.h>
 #include <nvgpu/vm.h>
 #include <nvgpu/vm_area.h>
+#include <nvgpu/gmmu.h>
 #include <nvgpu/lock.h>
 #include <nvgpu/list.h>
 #include <nvgpu/rbtree.h>
@@ -34,6 +35,22 @@ int vm_aspace_id(struct vm_gk20a *vm)
         return vm->as_share ? vm->as_share->id : -1;
 }
 
+static void nvgpu_vm_free_entries(struct vm_gk20a *vm,
+                                  struct gk20a_mm_entry *parent,
+                                  int level)
+{
+        int i;
+
+        if (parent->entries)
+                for (i = 0; i < parent->num_entries; i++)
+                        nvgpu_vm_free_entries(vm, &parent->entries[i], level+1);
+
+        if (parent->mem.size)
+                nvgpu_free_gmmu_pages(vm, parent);
+        nvgpu_vfree(vm->mm->g, parent->entries);
+        parent->entries = NULL;
+}
+
 u64 __nvgpu_vm_alloc_va(struct vm_gk20a *vm, u64 size,
                         enum gmmu_pgsz_gk20a pgsz_idx)
 
@@ -421,7 +438,7 @@ clean_up_allocators:
 clean_up_page_tables:
         /* Cleans up nvgpu_vm_init_page_tables() */
         nvgpu_vfree(g, vm->pdb.entries);
-        free_gmmu_pages(vm, &vm->pdb);
+        nvgpu_free_gmmu_pages(vm, &vm->pdb);
 clean_up_vgpu_vm:
 #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
         if (g->is_virtual)
@@ -537,7 +554,7 @@ static void __nvgpu_vm_remove(struct vm_gk20a *vm)
         if (nvgpu_alloc_initialized(&vm->user_lp))
                 nvgpu_alloc_destroy(&vm->user_lp);
 
-        gk20a_vm_free_entries(vm, &vm->pdb, 0);
+        nvgpu_vm_free_entries(vm, &vm->pdb, 0);
 
 #ifdef CONFIG_TEGRA_GR_VIRTUALIZATION
         if (g->is_virtual)