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>

3 files changed, 11 insertions, 11 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/cde_gm20b.c b/drivers/gpu/nvgpu/gm20b/cde_gm20b.c
index d23ba8c5..f8267d1d 100644
--- a/drivers/gpu/nvgpu/gm20b/cde_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/cde_gm20b.c
@@ -1,7 +1,7 @@
 /*
  * GM20B CDE
  *
- * Copyright (c) 2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -26,7 +26,7 @@ enum programs {
         PROG_PASSTHROUGH        = 6,
 };
 
-static void gm20b_cde_get_program_numbers(struct gk20a *g,
+void gm20b_cde_get_program_numbers(struct gk20a *g,
                                           u32 block_height_log2,
                                           int *hprog_out, int *vprog_out)
 {
@@ -46,8 +46,3 @@ static void gm20b_cde_get_program_numbers(struct gk20a *g,
         *hprog_out = hprog;
         *vprog_out = vprog;
 }
-
-void gm20b_init_cde_ops(struct gpu_ops *gops)
-{
-        gops->cde.get_program_numbers = gm20b_cde_get_program_numbers;
-}
diff --git a/drivers/gpu/nvgpu/gm20b/cde_gm20b.h b/drivers/gpu/nvgpu/gm20b/cde_gm20b.h
index 66e303f5..f2ea20a0 100644
--- a/drivers/gpu/nvgpu/gm20b/cde_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/cde_gm20b.h
@@ -1,7 +1,7 @@
 /*
  * GM20B CDE
  *
- * Copyright (c) 2015, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2017, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -16,8 +16,10 @@
 #ifndef _NVHOST_GM20B_CDE
 #define _NVHOST_GM20B_CDE
 
-struct gpu_ops;
+struct gk20a;
 
-void gm20b_init_cde_ops(struct gpu_ops *gops);
+void gm20b_cde_get_program_numbers(struct gk20a *g,
+                                          u32 block_height_log2,
+                                          int *hprog_out, int *vprog_out);
 
 #endif
diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index 4d2e56d5..b16289f9 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -199,6 +199,9 @@ static const struct gpu_ops gm20b_ops = {
                 .pg_gr_load_gating_prod =
                         gr_gm20b_pg_gr_load_gating_prod,
         },
+        .cde = {
+                .get_program_numbers = gm20b_cde_get_program_numbers
+        },
         .chip_init_gpu_characteristics = gk20a_init_gpu_characteristics,
         .get_litter_value = gm20b_get_litter_value,
 };
@@ -211,6 +214,7 @@ int gm20b_init_hal(struct gk20a *g)
 
         gops->ltc = gm20b_ops.ltc;
         gops->clock_gating = gm20b_ops.clock_gating;
+        gops->cde = gm20b_ops.cde;
 
         /* Lone functions */
         gops->chip_init_gpu_characteristics =
@@ -261,7 +265,6 @@ int gm20b_init_hal(struct gk20a *g)
         gm20b_init_regops(gops);
         gk20a_init_debug_ops(gops);
         gk20a_init_dbg_session_ops(gops);
-        gm20b_init_cde_ops(gops);
         gm20b_init_therm_ops(gops);
         gk20a_init_tsg_ops(gops);
 #if defined(CONFIG_GK20A_CYCLE_STATS)