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

diff --git a/drivers/gpu/nvgpu/gm20b/mm_gm20b.h b/drivers/gpu/nvgpu/gm20b/mm_gm20b.h
index b1bb38a3..2bb29ea8 100644
--- a/drivers/gpu/nvgpu/gm20b/mm_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/mm_gm20b.h
@@ -1,7 +1,7 @@
 /*
  * GM20B GMMU
  *
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014, 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,
@@ -20,13 +20,9 @@ struct gk20a;
 #define PDE_ADDR_START(x, y)    ((x) &  ~((0x1UL << (y)) - 1))
 #define PDE_ADDR_END(x, y)      ((x) | ((0x1UL << (y)) - 1))
 
-void gm20b_mm_set_big_page_size(struct gk20a *g,
-                                struct nvgpu_mem *mem, int size);
-u32 gm20b_mm_get_big_page_sizes(void);
-u32 gm20b_mm_get_default_big_page_size(void);
-bool gm20b_mm_support_sparse(struct gk20a *g);
-bool gm20b_mm_is_bar1_supported(struct gk20a *g);
-int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g);
 u64 gm20b_gpu_phys_addr(struct gk20a *g,
                         struct nvgpu_gmmu_attrs *attrs, u64 phys);
+
+void gm20b_init_mm(struct gpu_ops *gops);
+int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g);
 #endif