gpu: nvgpu: Remove extraneous VM init/deinit APIs

Support only VM pointers and ref-counting for maintaining VMs. This
dramatically reduces the complexity of the APIs, avoids the API
abuse that has existed, and ensures that future VM usage is
consistent with current usage.

Also remove the combined VM free/instance block deletion. Any place
where this was done is now replaced with an explict free of the
instance block and a nvgpu_vm_put().

JIRA NVGPU-12
JIRA NVGPU-30

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

1 files changed, 8 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
index bc4aee3a..3cd3eb50 100644
--- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.c
@@ -67,32 +67,33 @@ static int gb10b_init_bar2_vm(struct gk20a *g)
 {
         int err;
         struct mm_gk20a *mm = &g->mm;
-        struct vm_gk20a *vm = &mm->bar2.vm;
         struct nvgpu_mem *inst_block = &mm->bar2.inst_block;
         u32 big_page_size = gk20a_get_platform(g->dev)->default_big_page_size;
 
         /* BAR2 aperture size is 32MB */
         mm->bar2.aperture_size = 32 << 20;
         gk20a_dbg_info("bar2 vm size = 0x%x", mm->bar2.aperture_size);
-        nvgpu_init_vm(mm, vm, big_page_size, SZ_4K,
+
+        mm->bar2.vm = nvgpu_vm_init(g, big_page_size, SZ_4K,
                 mm->bar2.aperture_size - SZ_4K,
                 mm->bar2.aperture_size, false, false, "bar2");
+        if (!mm->bar2.vm)
+                return -ENOMEM;
 
         /* allocate instance mem for bar2 */
         err = gk20a_alloc_inst_block(g, inst_block);
         if (err)
                 goto clean_up_va;
 
-        g->ops.mm.init_inst_block(inst_block, vm, big_page_size);
+        g->ops.mm.init_inst_block(inst_block, mm->bar2.vm, big_page_size);
 
         return 0;
 
 clean_up_va:
-        nvgpu_deinit_vm(vm);
+        nvgpu_vm_put(mm->bar2.vm);
         return err;
 }
 
-
 static int gb10b_init_bar2_mm_hw_setup(struct gk20a *g)
 {
         struct mm_gk20a *mm = &g->mm;
@@ -401,7 +402,8 @@ static void gp10b_remove_bar2_vm(struct gk20a *g)
         struct mm_gk20a *mm = &g->mm;
 
         gp10b_replayable_pagefault_buffer_deinit(g);
-        nvgpu_vm_remove_inst(&mm->bar2.vm, &mm->bar2.inst_block);
+        gk20a_free_inst_block(g, &mm->bar2.inst_block);
+        nvgpu_vm_put(mm->bar2.vm);
 }