diff options
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu')
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gp10b/vgpu_hal_gp10b.c | 6 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/vgpu/gv11b/vgpu_hal_gv11b.c | 8 |
2 files changed, 9 insertions, 5 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 = { |
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 @@ | |||
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/fb/fb_gv11b.h" | 31 | #include "common/fb/fb_gv11b.h" |
32 | #include "common/therm/therm_gm20b.h" | ||
33 | #include "common/therm/therm_gp10b.h" | ||
34 | #include "common/therm/therm_gv11b.h" | ||
32 | 35 | ||
33 | #include <gk20a/gk20a.h> | 36 | #include <gk20a/gk20a.h> |
34 | #include <gv11b/hal_gv11b.h> | 37 | #include <gv11b/hal_gv11b.h> |
@@ -63,7 +66,6 @@ | |||
63 | #include <gp10b/ce_gp10b.h> | 66 | #include <gp10b/ce_gp10b.h> |
64 | #include "gp10b/gr_gp10b.h" | 67 | #include "gp10b/gr_gp10b.h" |
65 | #include <gp10b/fifo_gp10b.h> | 68 | #include <gp10b/fifo_gp10b.h> |
66 | #include <gp10b/therm_gp10b.h> | ||
67 | #include <gp10b/ltc_gp10b.h> | 69 | #include <gp10b/ltc_gp10b.h> |
68 | #include <gp10b/fuse_gp10b.h> | 70 | #include <gp10b/fuse_gp10b.h> |
69 | 71 | ||
@@ -76,7 +78,6 @@ | |||
76 | #include <gv11b/mc_gv11b.h> | 78 | #include <gv11b/mc_gv11b.h> |
77 | #include <gv11b/ce_gv11b.h> | 79 | #include <gv11b/ce_gv11b.h> |
78 | #include <gv11b/fifo_gv11b.h> | 80 | #include <gv11b/fifo_gv11b.h> |
79 | #include <gv11b/therm_gv11b.h> | ||
80 | #include <gv11b/regops_gv11b.h> | 81 | #include <gv11b/regops_gv11b.h> |
81 | #include <gv11b/gr_ctx_gv11b.h> | 82 | #include <gv11b/gr_ctx_gv11b.h> |
82 | #include <gv11b/ltc_gv11b.h> | 83 | #include <gv11b/ltc_gv11b.h> |
@@ -200,7 +201,6 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
200 | .commit_inst = vgpu_gr_gv11b_commit_inst, | 201 | .commit_inst = vgpu_gr_gv11b_commit_inst, |
201 | .write_zcull_ptr = gr_gv11b_write_zcull_ptr, | 202 | .write_zcull_ptr = gr_gv11b_write_zcull_ptr, |
202 | .write_pm_ptr = gr_gv11b_write_pm_ptr, | 203 | .write_pm_ptr = gr_gv11b_write_pm_ptr, |
203 | .init_elcg_mode = gr_gv11b_init_elcg_mode, | ||
204 | .load_tpc_mask = gr_gv11b_load_tpc_mask, | 204 | .load_tpc_mask = gr_gv11b_load_tpc_mask, |
205 | .inval_icache = gr_gk20a_inval_icache, | 205 | .inval_icache = gr_gk20a_inval_icache, |
206 | .trigger_suspend = gv11b_gr_sm_trigger_suspend, | 206 | .trigger_suspend = gv11b_gr_sm_trigger_suspend, |
@@ -505,6 +505,8 @@ static const struct gpu_ops vgpu_gv11b_ops = { | |||
505 | }, | 505 | }, |
506 | .therm = { | 506 | .therm = { |
507 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, | 507 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, |
508 | .init_elcg_mode = gv11b_therm_init_elcg_mode, | ||
509 | .init_blcg_mode = gm20b_therm_init_blcg_mode, | ||
508 | .elcg_init_idle_filters = gv11b_elcg_init_idle_filters, | 510 | .elcg_init_idle_filters = gv11b_elcg_init_idle_filters, |
509 | }, | 511 | }, |
510 | .pmu = { | 512 | .pmu = { |