Revert "gpu: nvgpu: Reorg mm HAL initialization"

Conflicts with gv100 changes

This reverts commit 8d63cd3995d4a650b478ad69d7e29ed2b1b2d927.

Change-Id: Ie2f88d281b2b87a9a794d79164a61c4d883626b7
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537668
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>

1 files changed, 9 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gp106/mm_gp106.c b/drivers/gpu/nvgpu/gp106/mm_gp106.c
index 82c58e97..b7d7e8b8 100644
--- a/drivers/gpu/nvgpu/gp106/mm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/mm_gp106.c
@@ -1,7 +1,7 @@
 /*
  * GP106 memory management
  *
- * Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -19,7 +19,7 @@
 
 #include <nvgpu/hw/gp106/hw_fb_gp106.h>
 
-size_t gp106_mm_get_vidmem_size(struct gk20a *g)
+static size_t gp106_mm_get_vidmem_size(struct gk20a *g)
 {
         u32 range = gk20a_readl(g, fb_mmu_local_memory_range_r());
         u32 mag = fb_mmu_local_memory_range_lower_mag_v(range);
@@ -32,3 +32,10 @@ size_t gp106_mm_get_vidmem_size(struct gk20a *g)
 
         return bytes;
 }
+
+void gp106_init_mm(struct gpu_ops *gops)
+{
+        gp10b_init_mm(gops);
+        gops->mm.get_vidmem_size = gp106_mm_get_vidmem_size;
+        gops->mm.get_physical_addr_bits = NULL;
+}