gpu: nvgpu: vgpu: flatten out t19x 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: I8d277aaccb0e63b2d504e7aba32eb31ef82f4ec0
Signed-off-by: Peter Daifuku <pdaifuku@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1574619
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Richard Zhao <rizhao@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 1 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c
index a3d1cd90..89952221 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_gr_gv11b.c
@@ -22,12 +22,10 @@
 
 #include <gk20a/gk20a.h>
 #include <vgpu/gr_vgpu.h>
-#include <vgpu/gp10b/vgpu_gr_gp10b.h>
 
-#include "vgpu_gr_gv11b.h"
 #include "vgpu_subctx_gv11b.h"
 
-static int vgpu_gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va)
+int vgpu_gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va)
 {
         int err;
 
@@ -41,9 +39,3 @@ static int vgpu_gr_gv11b_commit_inst(struct channel_gk20a *c, u64 gpu_va)
 
         return err;
 }
-
-void vgpu_gv11b_init_gr_ops(struct gpu_ops *gops)
-{
-        vgpu_gp10b_init_gr_ops(gops);
-        gops->gr.commit_inst = vgpu_gr_gv11b_commit_inst;
-}