gpu: nvgpu: vgpu: flatten out vgpu hal

Instead of calling the native HAL init function then adding
multiple layers of modification for VGPU, flatten out the sequence
so that all entry points are set statically and visible in a
single file.

JIRA ESRM-30

Change-Id: Ie424abb48bce5038874851d399baac5e4bb7d27c
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1574616
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 2 insertions, 13 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
index cb7008ba..f063961f 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
@@ -28,7 +28,7 @@
 
 #include <nvgpu/bug.h>
 
-static int vgpu_gp10b_init_mm_setup_hw(struct gk20a *g)
+int vgpu_gp10b_init_mm_setup_hw(struct gk20a *g)
 {
         g->mm.bypass_smmu = true;
         g->mm.disable_bigpage = true;
@@ -47,7 +47,7 @@ static inline int add_mem_desc(struct tegra_vgpu_mem_desc *mem_desc,
         return 0;
 }
 
-static u64 vgpu_gp10b_locked_gmmu_map(struct vm_gk20a *vm,
+u64 vgpu_gp10b_locked_gmmu_map(struct vm_gk20a *vm,
                                 u64 map_offset,
                                 struct nvgpu_sgt *sgt,
                                 u64 buffer_offset,
@@ -200,14 +200,3 @@ fail:
 
         return 0;
 }
-
-void vgpu_gp10b_init_mm_ops(struct gpu_ops *gops)
-{
-        gk20a_dbg_fn("");
-
-        gops->mm.gmmu_map = vgpu_gp10b_locked_gmmu_map;
-        gops->mm.init_mm_setup_hw = vgpu_gp10b_init_mm_setup_hw;
-
-        /* FIXME: add support for sparse mappings */
-        gops->mm.support_sparse = NULL;
-}