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, 4 insertions, 2 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 90d25fa0..02a2f0a6 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -34,6 +34,8 @@
 #include "common/fb/fb_gm20b.h"
 #include "common/fb/fb_gp106.h"
 #include "common/xve/xve_gp106.h"
+#include "common/therm/therm_gm20b.h"
+#include "common/therm/therm_gp106.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -76,7 +78,6 @@
 #include "gp106/clk_arb_gp106.h"
 #include "gp106/mclk_gp106.h"
 #include "gp106/bios_gp106.h"
-#include "gp106/therm_gp106.h"
 #include "gp106/fifo_gp106.h"
 #include "gp106/clk_gp106.h"
 #include "gp106/mm_gp106.h"
@@ -349,7 +350,6 @@ static const struct gpu_ops gp106_ops = {
                 .commit_inst = gr_gk20a_commit_inst,
                 .write_zcull_ptr = gr_gk20a_write_zcull_ptr,
                 .write_pm_ptr = gr_gk20a_write_pm_ptr,
-                .init_elcg_mode = gr_gk20a_init_elcg_mode,
                 .load_tpc_mask = gr_gm20b_load_tpc_mask,
                 .inval_icache = gr_gk20a_inval_icache,
                 .trigger_suspend = gr_gk20a_trigger_suspend,
@@ -606,6 +606,8 @@ static const struct gpu_ops gp106_ops = {
 #ifdef CONFIG_DEBUG_FS
                 .therm_debugfs_init = gp106_therm_debugfs_init,
 #endif /* CONFIG_DEBUG_FS */
+                .init_elcg_mode = gm20b_therm_init_elcg_mode,
+                .init_blcg_mode = gm20b_therm_init_blcg_mode,
                 .elcg_init_idle_filters = gp106_elcg_init_idle_filters,
                 .get_internal_sensor_curr_temp =
                         gp106_get_internal_sensor_curr_temp,