From 91390d857f6302f9c2923ec4188ea7e24ee537a2 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Thu, 9 Aug 2018 09:20:33 -0700 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1795989 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv11b/hal_gv11b.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b/hal_gv11b.c') diff --git a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c index 05763cce..111a1ea2 100644 --- a/drivers/gpu/nvgpu/gv11b/hal_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/hal_gv11b.c @@ -33,6 +33,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 "gk20a/fifo_gk20a.h" @@ -54,7 +57,6 @@ #include "gm20b/pmu_gm20b.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" @@ -84,7 +86,6 @@ #include "fifo_gv11b.h" #include "regops_gv11b.h" #include "subctx_gv11b.h" -#include "therm_gv11b.h" #include "ecc_gv11b.h" #include @@ -341,7 +342,6 @@ static const struct gpu_ops gv11b_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, @@ -664,6 +664,8 @@ static const struct gpu_ops gv11b_ops = { }, .therm = { .init_therm_setup_hw = gv11b_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 = { -- cgit v1.2.2