diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-09 12:20:33 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-14 18:33:20 -0400 |
commit | 91390d857f6302f9c2923ec4188ea7e24ee537a2 (patch) | |
tree | e0884e79ea748d2c0bd384c29f805125a7b88fec /drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |
parent | 02f9c99e4b4a452ded20978c5ee1e27b775b9224 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c index 15e2717d..aadd17d6 100644 --- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -28,6 +28,8 @@ | |||
28 | #include "common/fb/fb_gk20a.h" | 28 | #include "common/fb/fb_gk20a.h" |
29 | #include "common/fb/fb_gm20b.h" | 29 | #include "common/fb/fb_gm20b.h" |
30 | #include "common/fb/fb_gp10b.h" | 30 | #include "common/fb/fb_gp10b.h" |
31 | #include "common/therm/therm_gm20b.h" | ||
32 | #include "common/therm/therm_gp10b.h" | ||
31 | 33 | ||
32 | #include "vgpu/fifo_vgpu.h" | 34 | #include "vgpu/fifo_vgpu.h" |
33 | #include "vgpu/gr_vgpu.h" | 35 | #include "vgpu/gr_vgpu.h" |
@@ -56,7 +58,6 @@ | |||
56 | #include "gp10b/gr_ctx_gp10b.h" | 58 | #include "gp10b/gr_ctx_gp10b.h" |
57 | #include "gp10b/fifo_gp10b.h" | 59 | #include "gp10b/fifo_gp10b.h" |
58 | #include "gp10b/regops_gp10b.h" | 60 | #include "gp10b/regops_gp10b.h" |
59 | #include "gp10b/therm_gp10b.h" | ||
60 | #include "gp10b/fuse_gp10b.h" | 61 | #include "gp10b/fuse_gp10b.h" |
61 | 62 | ||
62 | #include "gm20b/ltc_gm20b.h" | 63 | #include "gm20b/ltc_gm20b.h" |
@@ -182,7 +183,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
182 | .commit_inst = vgpu_gr_commit_inst, | 183 | .commit_inst = vgpu_gr_commit_inst, |
183 | .write_zcull_ptr = gr_gk20a_write_zcull_ptr, | 184 | .write_zcull_ptr = gr_gk20a_write_zcull_ptr, |
184 | .write_pm_ptr = gr_gk20a_write_pm_ptr, | 185 | .write_pm_ptr = gr_gk20a_write_pm_ptr, |
185 | .init_elcg_mode = gr_gk20a_init_elcg_mode, | ||
186 | .load_tpc_mask = gr_gm20b_load_tpc_mask, | 186 | .load_tpc_mask = gr_gm20b_load_tpc_mask, |
187 | .inval_icache = gr_gk20a_inval_icache, | 187 | .inval_icache = gr_gk20a_inval_icache, |
188 | .trigger_suspend = gr_gk20a_trigger_suspend, | 188 | .trigger_suspend = gr_gk20a_trigger_suspend, |
@@ -440,6 +440,8 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
440 | }, | 440 | }, |
441 | .therm = { | 441 | .therm = { |
442 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, | 442 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, |
443 | .init_elcg_mode = gm20b_therm_init_elcg_mode, | ||
444 | .init_blcg_mode = gm20b_therm_init_blcg_mode, | ||
443 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, | 445 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, |
444 | }, | 446 | }, |
445 | .pmu = { | 447 | .pmu = { |