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, 6 insertions, 8 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
index 16c35d34..7e2ba051 100644
--- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.h
@@ -78,8 +78,6 @@ struct pm_ctx_desc {
         u32 pm_mode;
 };
 
-struct gk20a;
-
 struct compbit_store_desc {
         struct nvgpu_mem mem;
 
@@ -191,19 +189,19 @@ struct mm_gk20a {
 
         struct {
                 u32 aperture_size;
-                struct vm_gk20a vm;
+                struct vm_gk20a *vm;
                 struct nvgpu_mem inst_block;
         } bar1;
 
         struct {
                 u32 aperture_size;
-                struct vm_gk20a vm;
+                struct vm_gk20a *vm;
                 struct nvgpu_mem inst_block;
         } bar2;
 
         struct {
                 u32 aperture_size;
-                struct vm_gk20a vm;
+                struct vm_gk20a *vm;
                 struct nvgpu_mem inst_block;
         } pmu;
 
@@ -213,16 +211,16 @@ struct mm_gk20a {
         } hwpm;
 
         struct {
-                struct vm_gk20a vm;
+                struct vm_gk20a *vm;
                 struct nvgpu_mem inst_block;
         } perfbuf;
 
         struct {
-                struct vm_gk20a vm;
+                struct vm_gk20a *vm;
         } cde;
 
         struct {
-                struct vm_gk20a vm;
+                struct vm_gk20a *vm;
         } ce;
 
         struct nvgpu_mutex l2_op_lock;