gpu: nvgpu: Fix NS boot transcfg

Bug 1667322

Accommodate for transcfg address change

Change-Id: I7054202b8ce3be1a3fbfe0465e662be6f9740eb3
Signed-off-by: Supriya <ssharatkumar@nvidia.com>
Reviewed-on: http://git-master/r/780326
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
index 2236e76c..18404ec0 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c
@@ -2476,7 +2476,7 @@ static void pmu_handle_pg_buf_config_msg(struct gk20a *g, struct pmu_msg *msg,
 static int gk20a_init_pmu_setup_hw1(struct gk20a *g)
 {
         struct pmu_gk20a *pmu = &g->pmu;
-        int err;
+        int err = 0;
 
         gk20a_dbg_fn("");
 
@@ -2501,12 +2501,9 @@ static int gk20a_init_pmu_setup_hw1(struct gk20a *g)
                 pwr_fbif_transcfg_mem_type_physical_f() |
                 pwr_fbif_transcfg_target_noncoherent_sysmem_f());
 
-        /* TBD: load pmu ucode */
-        err = pmu_bootstrap(pmu);
-        if (err)
-                return err;
+        err = g->ops.pmu.pmu_nsbootstrap(pmu);
 
-        return 0;
+        return err;
 
 }
 
@@ -2650,6 +2647,7 @@ void gk20a_init_pmu_ops(struct gpu_ops *gops)
 {
         gops->pmu.prepare_ucode = gk20a_prepare_ucode;
         gops->pmu.pmu_setup_hw_and_bootstrap = gk20a_init_pmu_setup_hw1;
+        gops->pmu.pmu_nsbootstrap = pmu_bootstrap;
         gops->pmu.pmu_setup_elpg = NULL;
         gops->pmu.init_wpr_region = NULL;
         gops->pmu.load_lsfalcon_ucode = NULL;