summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c')
-rw-r--r--drivers/gpu/nvgpu/gm20b/acr_gm20b.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
index 3cfcbb19..181e5301 100644
--- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c
@@ -369,7 +369,7 @@ static int gm20b_alloc_blob_space(struct gk20a *g,
369{ 369{
370 int err; 370 int err;
371 371
372 err = gk20a_gmmu_alloc_sys(g, size, mem); 372 err = nvgpu_dma_alloc_sys(g, size, mem);
373 373
374 return err; 374 return err;
375} 375}
@@ -1115,7 +1115,7 @@ static int gm20b_bootstrap_hs_flcn(struct gk20a *g)
1115 err = -1; 1115 err = -1;
1116 goto err_release_acr_fw; 1116 goto err_release_acr_fw;
1117 } 1117 }
1118 err = gk20a_gmmu_alloc_map_sys(vm, img_size_in_bytes, 1118 err = nvgpu_dma_alloc_map_sys(vm, img_size_in_bytes,
1119 &acr->acr_ucode); 1119 &acr->acr_ucode);
1120 if (err) { 1120 if (err) {
1121 err = -ENOMEM; 1121 err = -ENOMEM;
@@ -1171,7 +1171,7 @@ static int gm20b_bootstrap_hs_flcn(struct gk20a *g)
1171 } 1171 }
1172 return 0; 1172 return 0;
1173err_free_ucode_map: 1173err_free_ucode_map:
1174 gk20a_gmmu_unmap_free(vm, &acr->acr_ucode); 1174 nvgpu_dma_unmap_free(vm, &acr->acr_ucode);
1175err_release_acr_fw: 1175err_release_acr_fw:
1176 release_firmware(acr_fw); 1176 release_firmware(acr_fw);
1177 acr->acr_fw = NULL; 1177 acr->acr_fw = NULL;
@@ -1417,7 +1417,7 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt)
1417 /*TODO in code verify that enable PMU is done, 1417 /*TODO in code verify that enable PMU is done,
1418 scrubbing etc is done*/ 1418 scrubbing etc is done*/
1419 /*TODO in code verify that gmmu vm init is done*/ 1419 /*TODO in code verify that gmmu vm init is done*/
1420 err = gk20a_gmmu_alloc_flags_sys(g, 1420 err = nvgpu_dma_alloc_flags_sys(g,
1421 NVGPU_DMA_READ_ONLY, bl_sz, &acr->hsbl_ucode); 1421 NVGPU_DMA_READ_ONLY, bl_sz, &acr->hsbl_ucode);
1422 if (err) { 1422 if (err) {
1423 gk20a_err(d, "failed to allocate memory\n"); 1423 gk20a_err(d, "failed to allocate memory\n");
@@ -1475,7 +1475,7 @@ err_unmap_bl:
1475 gk20a_gmmu_unmap(vm, acr->hsbl_ucode.gpu_va, 1475 gk20a_gmmu_unmap(vm, acr->hsbl_ucode.gpu_va,
1476 acr->hsbl_ucode.size, gk20a_mem_flag_none); 1476 acr->hsbl_ucode.size, gk20a_mem_flag_none);
1477err_free_ucode: 1477err_free_ucode:
1478 gk20a_gmmu_free(g, &acr->hsbl_ucode); 1478 nvgpu_dma_free(g, &acr->hsbl_ucode);
1479err_done: 1479err_done:
1480 release_firmware(hsbl_fw); 1480 release_firmware(hsbl_fw);
1481 return err; 1481 return err;