gpu: nvgpu: Common VM initializer

Merge initialization code from gk20a_init_system_vm(),
gk20a_init_bar1_vm() and gk20a_vm_alloc_share() into gk20a_init_vm().

Remove redundant page size data, and move the page size fields to be
VM specific.

Bug 1558739
Bug 1560370

Change-Id: I4557d9e04d65ccb48fe1f2b116dd1bfa74cae98e
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 05877159..76985994 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1887,9 +1887,9 @@ int gk20a_init_gpu_characteristics(struct gk20a *g)
 
         gpu->bus_type = NVGPU_GPU_BUS_TYPE_AXI; /* always AXI for now */
 
-        gpu->big_page_size = g->mm.big_page_size;
-        gpu->compression_page_size = g->mm.compression_page_size;
-        gpu->pde_coverage_bit_count = g->mm.pde_stride_shift;
+        gpu->big_page_size = g->mm.pmu.vm.big_page_size;
+        gpu->compression_page_size = g->mm.pmu.vm.compression_page_size;
+        gpu->pde_coverage_bit_count = g->mm.pmu.vm.pde_stride_shift;
 
         gpu->flags = NVGPU_GPU_FLAGS_SUPPORT_PARTIAL_MAPPINGS
                 | NVGPU_GPU_FLAGS_SUPPORT_SPARSE_ALLOCS;