summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-04-04 19:08:52 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-06 21:15:15 -0400
commit1a426c981c4fa2816d969b27163ab2dbc2fa4e89 (patch)
treefba9c8688b88c512b7f1a87f457dec51cf6be49c /drivers/gpu/nvgpu/gv11b/gr_gv11b.c
parent26159aed046393e5d01060323a76f838d2f5bba3 (diff)
gpu: nvgpu: Rename nvgpu DMA APIs
gv11b changes to go along with gpu: nvgpu: Rename nvgpu DMA APIs In the main nvgpu repo. JIRA NVGPU-12 Change-Id: I5e28b13448d171e1511ace0842e53700385f8489 Signed-off-by: Alex Waterman <alexw@nvidia.com> Reviewed-on: http://git-master/r/1455213 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com> Reviewed-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com> GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/gr_gv11b.c')
-rw-r--r--drivers/gpu/nvgpu/gv11b/gr_gv11b.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
index a9f0d1e0..f4e31ec0 100644
--- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
+++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c
@@ -649,7 +649,7 @@ int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size,
649 649
650 gk20a_dbg_fn(""); 650 gk20a_dbg_fn("");
651 651
652 err = gk20a_gmmu_alloc_sys(vm->mm->g, size, mem); 652 err = nvgpu_dma_alloc_sys(vm->mm->g, size, mem);
653 if (err) 653 if (err)
654 return err; 654 return err;
655 655
@@ -669,7 +669,7 @@ int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size,
669 return 0; 669 return 0;
670 670
671fail_free: 671fail_free:
672 gk20a_gmmu_free(vm->mm->g, mem); 672 nvgpu_dma_free(vm->mm->g, mem);
673 return err; 673 return err;
674} 674}
675 675
@@ -764,11 +764,11 @@ static int gr_gv11b_alloc_gr_ctx(struct gk20a *g,
764 return err; 764 return err;
765 765
766fail_free_betacb: 766fail_free_betacb:
767 gk20a_gmmu_unmap_free(vm, &(*gr_ctx)->t18x.betacb_ctxsw_buffer); 767 nvgpu_dma_unmap_free(vm, &(*gr_ctx)->t18x.betacb_ctxsw_buffer);
768fail_free_spill: 768fail_free_spill:
769 gk20a_gmmu_unmap_free(vm, &(*gr_ctx)->t18x.spill_ctxsw_buffer); 769 nvgpu_dma_unmap_free(vm, &(*gr_ctx)->t18x.spill_ctxsw_buffer);
770fail_free_preempt: 770fail_free_preempt:
771 gk20a_gmmu_unmap_free(vm, &(*gr_ctx)->t18x.preempt_ctxsw_buffer); 771 nvgpu_dma_unmap_free(vm, &(*gr_ctx)->t18x.preempt_ctxsw_buffer);
772fail_free_gk20a_ctx: 772fail_free_gk20a_ctx:
773 gr_gk20a_free_gr_ctx(g, vm, *gr_ctx); 773 gr_gk20a_free_gr_ctx(g, vm, *gr_ctx);
774 *gr_ctx = NULL; 774 *gr_ctx = NULL;
@@ -824,10 +824,10 @@ static void gr_gv11b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
824 if (g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close) 824 if (g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close)
825 dump_ctx_switch_stats(g, vm, gr_ctx); 825 dump_ctx_switch_stats(g, vm, gr_ctx);
826 826
827 gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer); 827 nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer);
828 gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer); 828 nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer);
829 gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer); 829 nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer);
830 gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer); 830 nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer);
831 gr_gk20a_free_gr_ctx(g, vm, gr_ctx); 831 gr_gk20a_free_gr_ctx(g, vm, gr_ctx);
832 gk20a_dbg_fn("done"); 832 gk20a_dbg_fn("done");
833} 833}