gpu: nvgpu: Reorg debug HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch covers the debug
and dbg_session_ops sub-modules of the gpu_ops struct.

Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.

Jira NVGPU-74

Change-Id: Id51feeccbea91f884a6057efc680566a7d5d0b6d
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1514822
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

1 files changed, 18 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 8521bf6d..14f7dc2e 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -19,6 +19,7 @@
 #include "gk20a/bus_gk20a.h"
 #include "gk20a/pramin_gk20a.h"
 #include "gk20a/flcn_gk20a.h"
+#include "gk20a/regops_gk20a.h"
 #include "gk20a/mc_gk20a.h"
 
 #include "gp10b/ltc_gp10b.h"
@@ -257,6 +258,21 @@ static const struct gpu_ops gp106_ops = {
                 .boot_0 = gk20a_mc_boot_0,
                 .is_intr1_pending = mc_gp10b_is_intr1_pending,
         },
+        .debug = {
+                .show_dump = gk20a_debug_show_dump,
+        },
+        .dbg_session_ops = {
+                .exec_reg_ops = exec_regops_gk20a,
+                .dbg_set_powergate = dbg_set_powergate,
+                .check_and_set_global_reservation =
+                        nvgpu_check_and_set_global_reservation,
+                .check_and_set_context_reservation =
+                        nvgpu_check_and_set_context_reservation,
+                .release_profiler_reservation =
+                        nvgpu_release_profiler_reservation,
+                .perfbuffer_enable = gk20a_perfbuf_enable_locked,
+                .perfbuffer_disable = gk20a_perfbuf_disable_locked,
+        },
         .cde = {
                 .get_program_numbers = gp10b_cde_get_program_numbers,
                 .need_scatter_buffer = gp10b_need_scatter_buffer,
@@ -295,6 +311,8 @@ int gp106_init_hal(struct gk20a *g)
         gops->ltc = gp106_ops.ltc;
         gops->clock_gating = gp106_ops.clock_gating;
         gops->mc = gp106_ops.mc;
+        gops->debug = gp106_ops.debug;
+        gops->dbg_session_ops = gp106_ops.dbg_session_ops;
         gops->cde = gp106_ops.cde;
         gops->xve = gp106_ops.xve;
         gops->falcon = gp106_ops.falcon;
@@ -318,8 +336,6 @@ int gp106_init_hal(struct gk20a *g)
         gp106_init_gr_ctx(gops);
         gp106_init_mm(gops);
         gp106_init_pmu_ops(gops);
-        gk20a_init_debug_ops(gops);
-        gk20a_init_dbg_session_ops(gops);
         gp106_init_clk_ops(gops);
         gp106_init_clk_arb_ops(gops);
         gp106_init_regops(gops);