Revert "gpu: nvgpu: gv11b: Reorg mm HAL init"

This reverts commit 96615351ad11a186f5869e56acb3c1948ab7b7cc, which
conflicts with gv100 changes.

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

1 files changed, 2 insertions, 15 deletions

diff --git a/drivers/gpu/nvgpu/gv11b/mm_gv11b.h b/drivers/gpu/nvgpu/gv11b/mm_gv11b.h
index 12f0fe63..a887c7f4 100644
--- a/drivers/gpu/nvgpu/gv11b/mm_gv11b.h
+++ b/drivers/gpu/nvgpu/gv11b/mm_gv11b.h
@@ -18,20 +18,7 @@
 #define HW_FAULT_BUF_STATUS_ALLOC_TRUE  1
 #define HW_FAULT_BUF_STATUS_ALLOC_FALSE 0
 
-struct gk20a;
-struct nvgpu_mem;
-struct vm_gk20a;
-
-bool gv11b_mm_is_bar1_supported(struct gk20a *g);
-void gv11b_init_inst_block(struct nvgpu_mem *inst_block,
-                struct vm_gk20a *vm, u32 big_page_size);
-bool gv11b_mm_mmu_fault_pending(struct gk20a *g);
-void gv11b_mm_remove_bar2_vm(struct gk20a *g);
-int gv11b_init_mm_setup_hw(struct gk20a *g);
-int gv11b_init_bar2_mm_hw_setup(struct gk20a *g);
-void gv11b_mm_l2_flush(struct gk20a *g, bool invalidate);
-u64 gv11b_gpu_phys_addr(struct gk20a *g,
-                        struct nvgpu_gmmu_attrs *attrs, u64 phys);
-void gv11b_mm_fault_info_mem_destroy(struct gk20a *g);
+struct gpu_ops;
 
+void gv11b_init_mm(struct gpu_ops *gops);
 #endif