gpu: nvgpu: Reorg therm HAL initialization

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

3 files changed, 11 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 3a44f1ef..a2aacd2e 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -309,6 +309,10 @@ static const struct gpu_ops gp10b_ops = {
                 .exit = gk20a_pramin_exit,
                 .data032_r = pram_data032_r,
         },
+        .therm = {
+                .init_therm_setup_hw = gp10b_init_therm_setup_hw,
+                .elcg_init_idle_filters = gp10b_elcg_init_idle_filters,
+        },
         .mc = {
                 .intr_enable = mc_gp10b_intr_enable,
                 .intr_unit_config = mc_gp10b_intr_unit_config,
@@ -385,6 +389,7 @@ int gp10b_init_hal(struct gk20a *g)
         gops->gr_ctx = gp10b_ops.gr_ctx;
         gops->fecs_trace = gp10b_ops.fecs_trace;
         gops->pramin = gp10b_ops.pramin;
+        gops->therm = gp10b_ops.therm;
         gops->mc = gp10b_ops.mc;
         gops->debug = gp10b_ops.debug;
         gops->dbg_session_ops = gp10b_ops.dbg_session_ops;
@@ -448,7 +453,6 @@ int gp10b_init_hal(struct gk20a *g)
         gp10b_init_mm(gops);
         gp10b_init_pmu_ops(g);
         gp10b_init_regops(gops);
-        gp10b_init_therm_ops(gops);
 
         g->name = "gp10b";
 
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
index 925fc69b..43f44c92 100644
--- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.c
@@ -20,7 +20,7 @@
 
 #include <nvgpu/hw/gp10b/hw_therm_gp10b.h>
 
-static int gp10b_init_therm_setup_hw(struct gk20a *g)
+int gp10b_init_therm_setup_hw(struct gk20a *g)
 {
         u32 v;
 
@@ -80,7 +80,7 @@ static int gp10b_init_therm_setup_hw(struct gk20a *g)
         return 0;
 }
 
-static int gp10b_elcg_init_idle_filters(struct gk20a *g)
+int gp10b_elcg_init_idle_filters(struct gk20a *g)
 {
         u32 gate_ctrl, idle_filter;
         u32 engine_id;
diff --git a/drivers/gpu/nvgpu/gp10b/therm_gp10b.h b/drivers/gpu/nvgpu/gp10b/therm_gp10b.h
index 18c102fe..c9ed01e6 100644
--- a/drivers/gpu/nvgpu/gp10b/therm_gp10b.h
+++ b/drivers/gpu/nvgpu/gp10b/therm_gp10b.h
@@ -1,5 +1,5 @@
 /*
- * 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,
@@ -13,7 +13,8 @@
 #ifndef THERM_GP10B_H
 #define THERM_GP10B_H
 
-struct gpu_ops;
-void gp10b_init_therm_ops(struct gpu_ops *gops);
+struct gk20a;
+int gp10b_init_therm_setup_hw(struct gk20a *g);
+int gp10b_elcg_init_idle_filters(struct gk20a *g);
 
 #endif /* THERM_GP10B_H */