gpu: nvgpu: Move therm HAL to common

Move implementation of therm HAL to common/therm. ELCG and BLCG
code was embedded in gr HAL, so moved that code to therm.

Bump gk20a code to gm20b.

JIRA NVGPU-955

Change-Id: I9b03e52f2832d3a1d89071a577e8ce106aaf603b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1795989
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

1 files changed, 6 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c
index 344ad1e8..7926c35c 100644
--- a/drivers/gpu/nvgpu/gv100/hal_gv100.c
+++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c
@@ -35,6 +35,10 @@
 #include "common/fb/fb_gv11b.h"
 #include "common/fb/fb_gv100.h"
 #include "common/xve/xve_gp106.h"
+#include "common/therm/therm_gm20b.h"
+#include "common/therm/therm_gp106.h"
+#include "common/therm/therm_gp10b.h"
+#include "common/therm/therm_gv11b.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -61,13 +65,11 @@
 #include "gp106/acr_gp106.h"
 #include "gp106/sec2_gp106.h"
 #include "gp106/bios_gp106.h"
-#include "gp106/therm_gp106.h"
 #include "gp106/clk_gp106.h"
 #include "gp106/flcn_gp106.h"
 
 #include "gp10b/gr_gp10b.h"
 #include "gp10b/ltc_gp10b.h"
-#include "gp10b/therm_gp10b.h"
 #include "gp10b/mc_gp10b.h"
 #include "gp10b/ce_gp10b.h"
 #include "gp10b/fifo_gp10b.h"
@@ -385,7 +387,6 @@ static const struct gpu_ops gv100_ops = {
                 .commit_inst = gr_gv11b_commit_inst,
                 .write_zcull_ptr = gr_gv11b_write_zcull_ptr,
                 .write_pm_ptr = gr_gv11b_write_pm_ptr,
-                .init_elcg_mode = gr_gv11b_init_elcg_mode,
                 .load_tpc_mask = gr_gv11b_load_tpc_mask,
                 .inval_icache = gr_gk20a_inval_icache,
                 .trigger_suspend = gv11b_gr_sm_trigger_suspend,
@@ -703,6 +704,8 @@ static const struct gpu_ops gv100_ops = {
                 .therm_debugfs_init = gp106_therm_debugfs_init,
 #endif /* CONFIG_DEBUG_FS */
                 /* PROD values match with H/W INIT values */
+                .init_elcg_mode = gv11b_therm_init_elcg_mode,
+                .init_blcg_mode = gm20b_therm_init_blcg_mode,
                 .elcg_init_idle_filters = NULL,
                 .get_internal_sensor_curr_temp =
                         gp106_get_internal_sensor_curr_temp,