From 7bbf10b04a6eabf5991c63758c37fefd84ece45b Mon Sep 17 00:00:00 2001 From: rmylavarapu Date: Mon, 12 Dec 2022 11:07:27 +0000 Subject: [PATCH] gpu: nvgpu: gsp: bootstrap gsp scheduler firmware This change will call nvgpu_gsp_sched_bootstrap_hs which will bootstrap the gsp with gsp scheduler firmware. NVGPU-9297 Change-Id: If5de945dc7994666fd87ecf99e15ca2014c13573 Signed-off-by: rmylavarapu Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2826165 Tested-by: mobile promotions Reviewed-by: mobile promotions --- drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c | 2 +- drivers/gpu/nvgpu/common/init/nvgpu_init.c | 1 + drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h | 2 +- drivers/gpu/nvgpu/include/nvgpu/power_features/cg.h | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c index d9fdb77b0..10fb98006 100644 --- a/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c +++ b/drivers/gpu/nvgpu/common/gsp_scheduler/gsp_scheduler.c @@ -168,7 +168,7 @@ de_init: return err; } -int nvgpu_gsp_sched_bootstrap_ns(struct gk20a *g) +int nvgpu_gsp_sched_bootstrap_hs(struct gk20a *g) { struct nvgpu_gsp_sched *gsp_sched = g->gsp_sched; int status = 0; diff --git a/drivers/gpu/nvgpu/common/init/nvgpu_init.c b/drivers/gpu/nvgpu/common/init/nvgpu_init.c index 14ad089ba..560eaade5 100644 --- a/drivers/gpu/nvgpu/common/init/nvgpu_init.c +++ b/drivers/gpu/nvgpu/common/init/nvgpu_init.c @@ -995,6 +995,7 @@ int nvgpu_finalize_poweron(struct gk20a *g) #ifdef CONFIG_NVGPU_GSP_SCHEDULER /* Init gsp ops */ NVGPU_INIT_TABLE_ENTRY(&nvgpu_gsp_sched_sw_init, NVGPU_SUPPORT_GSP_SCHED), + NVGPU_INIT_TABLE_ENTRY(&nvgpu_gsp_sched_bootstrap_hs, NVGPU_SUPPORT_GSP_SCHED), #endif #ifndef CONFIG_NVGPU_DGPU #ifdef CONFIG_NVGPU_GSP_STRESS_TEST diff --git a/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h b/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h index eb77329ef..74dac8c47 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h +++ b/drivers/gpu/nvgpu/include/nvgpu/gsp_sched.h @@ -99,7 +99,7 @@ struct nvgpu_gsp_domain_info { struct nvgpu_gsp_runlist_info runlist_info[TOTAL_NO_OF_RUNLISTS]; }; -int nvgpu_gsp_sched_bootstrap_ns(struct gk20a *g); +int nvgpu_gsp_sched_bootstrap_hs(struct gk20a *g); int nvgpu_gsp_sched_sw_init(struct gk20a *g); void nvgpu_gsp_sched_sw_deinit(struct gk20a *g); void nvgpu_gsp_sched_suspend(struct gk20a *g, struct nvgpu_gsp_sched *gsp_sched); diff --git a/drivers/gpu/nvgpu/include/nvgpu/power_features/cg.h b/drivers/gpu/nvgpu/include/nvgpu/power_features/cg.h index d4f129d3b..6228cd94b 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/power_features/cg.h +++ b/drivers/gpu/nvgpu/include/nvgpu/power_features/cg.h @@ -524,7 +524,7 @@ void nvgpu_cg_elcg_ce_load_enable(struct gk20a *g); * * Checks the platform software capability slcg_enabled and programs registers * for configuring production gating values for SLCG for GSP. This is called - * in #nvgpu_gsp_sched_bootstrap_ns. + * in #nvgpu_gsp_sched_bootstrap_hs. * * Steps: * - Acquire the mutex #cg_pg_lock.