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, 5 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
index 995a2c2c..e2410e4e 100644
--- a/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
+++ b/drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c
@@ -29,6 +29,9 @@
 #include "common/fb/fb_gm20b.h"
 #include "common/fb/fb_gp10b.h"
 #include "common/fb/fb_gv11b.h"
+#include "common/therm/therm_gm20b.h"
+#include "common/therm/therm_gp10b.h"
+#include "common/therm/therm_gv11b.h"
 
 #include <gk20a/gk20a.h>
 #include <gv11b/hal_gv11b.h>
@@ -63,7 +66,6 @@
 #include <gp10b/ce_gp10b.h>
 #include "gp10b/gr_gp10b.h"
 #include <gp10b/fifo_gp10b.h>
-#include <gp10b/therm_gp10b.h>
 #include <gp10b/ltc_gp10b.h>
 #include <gp10b/fuse_gp10b.h>
 
@@ -76,7 +78,6 @@
 #include <gv11b/mc_gv11b.h>
 #include <gv11b/ce_gv11b.h>
 #include <gv11b/fifo_gv11b.h>
-#include <gv11b/therm_gv11b.h>
 #include <gv11b/regops_gv11b.h>
 #include <gv11b/gr_ctx_gv11b.h>
 #include <gv11b/ltc_gv11b.h>
@@ -200,7 +201,6 @@ static const struct gpu_ops vgpu_gv11b_ops = {
                 .commit_inst = vgpu_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,
@@ -505,6 +505,8 @@ static const struct gpu_ops vgpu_gv11b_ops = {
         },
         .therm = {
                 .init_therm_setup_hw = gp10b_init_therm_setup_hw,
+                .init_elcg_mode = gv11b_therm_init_elcg_mode,
+                .init_blcg_mode = gm20b_therm_init_blcg_mode,
                 .elcg_init_idle_filters = gv11b_elcg_init_idle_filters,
         },
         .pmu = {