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, 3 insertions, 16 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h
index a0b9acd6..4cc71ea6 100644
--- a/drivers/gpu/nvgpu/gp10b/mm_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/mm_gp10b.h
@@ -1,5 +1,5 @@
 /*
- * 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,
@@ -14,20 +14,7 @@
 #ifndef MM_GP10B_H
 #define MM_GP10B_H
 
-struct gk20a;
-struct gk20a_mmu_level;
-struct nvgpu_mem;
-struct vm_gk20a;
-
-u32 gp10b_mm_get_default_big_page_size(void);
-u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g);
-int gp10b_init_mm_setup_hw(struct gk20a *g);
-int gb10b_init_bar2_vm(struct gk20a *g);
-int gb10b_init_bar2_mm_hw_setup(struct gk20a *g);
-const struct gk20a_mmu_level *gp10b_mm_get_mmu_levels(struct gk20a *g,
-        u32 big_page_size);
-void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block,
-                struct vm_gk20a *vm);
-void gp10b_remove_bar2_vm(struct gk20a *g);
+struct gpu_ops;
 
+void gp10b_init_mm(struct gpu_ops *gops);
 #endif