4 files changed, 13 insertions, 24 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
index 82bf7b3e..1f9b856d 100644
--- a/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/dbg_gpu_gk20a.c
@@ -1924,7 +1924,7 @@ static int gk20a_perfbuf_map(struct dbg_session_gk20a *dbg_s,
 err_unmap:
         nvgpu_vm_unmap_buffer(vm, args->offset, NULL);
 err_remove_vm:
-        nvgpu_vm_remove(vm, &mm->perfbuf.inst_block);
+        nvgpu_vm_remove_inst(vm, &mm->perfbuf.inst_block);
         nvgpu_mutex_release(&g->dbg_sessions_lock);
         return err;
 }
@@ -1962,7 +1962,7 @@ static int gk20a_perfbuf_release_locked(struct gk20a *g, u64 offset)
         err = gk20a_perfbuf_disable_locked(g);
 
         nvgpu_vm_unmap_buffer(vm, offset, NULL);
-        nvgpu_vm_remove(vm, &mm->perfbuf.inst_block);
+        nvgpu_vm_remove_inst(vm, &mm->perfbuf.inst_block);
 
         g->perfbuf.owner = NULL;
         g->perfbuf.offset = 0;
diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index a8837433..ceadbae2 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -651,7 +651,6 @@ struct gpu_ops {
                                 int rw_flag,
                                 bool sparse,
                                 struct vm_gk20a_mapping_batch *batch);
-                void (*vm_remove)(struct vm_gk20a *vm);
                 int (*vm_alloc_share)(struct gk20a_as_share *as_share,
                                       u32 big_page_size, u32 flags);
                 int (*vm_bind_channel)(struct gk20a_as_share *as_share,
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
index 17f1622f..183a540a 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c
@@ -464,7 +464,7 @@ static void gk20a_remove_mm_ce_support(struct mm_gk20a *mm)
 
         mm->vidmem.ce_ctx_id = (u32)~0;
 
-        nvgpu_vm_remove_support_nofree(&mm->ce.vm);
+        __nvgpu_vm_remove(&mm->ce.vm);
 
 }
 
@@ -476,11 +476,11 @@ static void gk20a_remove_mm_support(struct mm_gk20a *mm)
                 g->ops.mm.remove_bar2_vm(g);
 
         if (g->ops.mm.is_bar1_supported(g))
-                nvgpu_vm_remove(&mm->bar1.vm, &mm->bar1.inst_block);
+                nvgpu_vm_remove_inst(&mm->bar1.vm, &mm->bar1.inst_block);
 
-        nvgpu_vm_remove(&mm->pmu.vm, &mm->pmu.inst_block);
+        nvgpu_vm_remove_inst(&mm->pmu.vm, &mm->pmu.inst_block);
         gk20a_free_inst_block(gk20a_from_mm(mm), &mm->hwpm.inst_block);
-        nvgpu_vm_remove_support_nofree(&mm->cde.vm);
+        __nvgpu_vm_remove(&mm->cde.vm);
 
         gk20a_semaphore_sea_destroy(g);
         gk20a_vidmem_destroy(g);
@@ -2337,10 +2337,9 @@ void nvgpu_vm_unmap_locked(struct nvgpu_mapped_buf *mapped_buffer,
         return;
 }
 
-
-static void gk20a_vm_free_entries(struct vm_gk20a *vm,
-                                  struct gk20a_mm_entry *parent,
-                                  int level)
+void gk20a_vm_free_entries(struct vm_gk20a *vm,
+                           struct gk20a_mm_entry *parent,
+                           int level)
 {
         int i;
 
@@ -2663,18 +2662,6 @@ int nvgpu_vm_unmap_buffer(struct vm_gk20a *vm, u64 offset,
         return 0;
 }
 
-void nvgpu_deinit_vm(struct vm_gk20a *vm)
-{
-        if (nvgpu_alloc_initialized(&vm->kernel))
-                nvgpu_alloc_destroy(&vm->kernel);
-        if (nvgpu_alloc_initialized(&vm->user))
-                nvgpu_alloc_destroy(&vm->user);
-        if (nvgpu_alloc_initialized(&vm->user_lp))
-                nvgpu_alloc_destroy(&vm->user_lp);
-
-        gk20a_vm_free_entries(vm, &vm->pdb, 0);
-}
-
 int gk20a_alloc_inst_block(struct gk20a *g, struct nvgpu_mem *inst_block)
 {
         int err;
@@ -3151,7 +3138,6 @@ void gk20a_init_mm(struct gpu_ops *gops)
 {
         gops->mm.gmmu_map = gk20a_locked_gmmu_map;
         gops->mm.gmmu_unmap = gk20a_locked_gmmu_unmap;
-        gops->mm.vm_remove = nvgpu_vm_remove_support;
         gops->mm.vm_alloc_share = gk20a_vm_alloc_share;
         gops->mm.vm_bind_channel = gk20a_vm_bind_channel;
         gops->mm.fb_flush = gk20a_mm_fb_flush;
diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 90a72811..4adf346e 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -463,4 +463,8 @@ int gk20a_mm_get_buffer_info(struct device *dev, int dmabuf_fd,
                              u64 *buffer_id, u64 *buffer_len);
 void gk20a_vm_unmap_locked_kref(struct kref *ref);
 
+void gk20a_vm_free_entries(struct vm_gk20a *vm,
+                           struct gk20a_mm_entry *parent,
+                           int level);
+
 #endif /* MM_GK20A_H */