gpu: nvgpu: Reorg cde HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the cde
sub-module 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: I9343ce4985eb941a2610f5f11e8f01269ab68481
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master/r/1511673
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 6 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index a13889ad..555a2192 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -239,6 +239,11 @@ static const struct gpu_ops gp106_ops = {
                 .pg_gr_load_gating_prod =
                         gr_gp106_pg_gr_load_gating_prod,
         },
+        .cde = {
+                .get_program_numbers = gp10b_cde_get_program_numbers,
+                .need_scatter_buffer = gp10b_need_scatter_buffer,
+                .populate_scatter_buffer = gp10b_populate_scatter_buffer,
+        },
         .xve = {
                 .sw_init          = xve_sw_init_gp106,
                 .get_speed        = xve_get_speed_gp106,
@@ -268,6 +273,7 @@ int gp106_init_hal(struct gk20a *g)
 
         gops->ltc = gp106_ops.ltc;
         gops->clock_gating = gp106_ops.clock_gating;
+        gops->cde = gp106_ops.cde;
         gops->xve = gp106_ops.xve;
 
         /* Lone functions */
@@ -296,7 +302,6 @@ int gp106_init_hal(struct gk20a *g)
         gp106_init_clk_ops(gops);
         gp106_init_clk_arb_ops(gops);
         gp106_init_regops(gops);
-        gp10b_init_cde_ops(gops);
         gk20a_init_tsg_ops(gops);
         gk20a_init_pramin_ops(gops);
 #if defined(CONFIG_GK20A_CYCLE_STATS)