summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/acr_gv11b.c')
-rw-r--r--drivers/gpu/nvgpu/gv11b/acr_gv11b.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
index fdd0f123..a6bbaa40 100644
--- a/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/acr_gv11b.c
@@ -187,8 +187,9 @@ int gv11b_bootstrap_hs_flcn(struct gk20a *g)
187 acr->acr_ucode.gpu_va + 187 acr->acr_ucode.gpu_va +
188 acr_ucode_header_t210_load[2]); 188 acr_ucode_header_t210_load[2]);
189 bl_dmem_desc->data_size = acr_ucode_header_t210_load[3]; 189 bl_dmem_desc->data_size = acr_ucode_header_t210_load[3];
190 } else 190 } else {
191 acr->acr_dmem_desc_v1->nonwpr_ucode_blob_size = 0; 191 acr->acr_dmem_desc_v1->nonwpr_ucode_blob_size = 0;
192 }
192 status = pmu_exec_gen_bl(g, bl_dmem_desc, 1); 193 status = pmu_exec_gen_bl(g, bl_dmem_desc, 1);
193 if (status != 0) { 194 if (status != 0) {
194 err = status; 195 err = status;
@@ -277,10 +278,12 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g,
277 pmu->isr_enabled = true; 278 pmu->isr_enabled = true;
278 nvgpu_mutex_release(&pmu->isr_mutex); 279 nvgpu_mutex_release(&pmu->isr_mutex);
279 280
280 if (g->ops.pmu.setup_apertures) 281 if (g->ops.pmu.setup_apertures) {
281 g->ops.pmu.setup_apertures(g); 282 g->ops.pmu.setup_apertures(g);
282 if (g->ops.pmu.update_lspmu_cmdline_args) 283 }
284 if (g->ops.pmu.update_lspmu_cmdline_args) {
283 g->ops.pmu.update_lspmu_cmdline_args(g); 285 g->ops.pmu.update_lspmu_cmdline_args(g);
286 }
284 287
285 /*disable irqs for hs falcon booting as we will poll for halt*/ 288 /*disable irqs for hs falcon booting as we will poll for halt*/
286 nvgpu_mutex_acquire(&pmu->isr_mutex); 289 nvgpu_mutex_acquire(&pmu->isr_mutex);
@@ -290,7 +293,8 @@ int gv11b_init_pmu_setup_hw1(struct gk20a *g,
290 /*Clearing mailbox register used to reflect capabilities*/ 293 /*Clearing mailbox register used to reflect capabilities*/
291 gk20a_writel(g, pwr_falcon_mailbox1_r(), 0); 294 gk20a_writel(g, pwr_falcon_mailbox1_r(), 0);
292 err = bl_bootstrap(pmu, desc, bl_sz); 295 err = bl_bootstrap(pmu, desc, bl_sz);
293 if (err) 296 if (err) {
294 return err; 297 return err;
298 }
295 return 0; 299 return 0;
296} 300}