diff options
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 18 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 6 |
2 files changed, 12 insertions, 12 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 | ||
671 | fail_free: | 671 | fail_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 | ||
766 | fail_free_betacb: | 766 | fail_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); |
768 | fail_free_spill: | 768 | fail_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); |
770 | fail_free_preempt: | 770 | fail_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); |
772 | fail_free_gk20a_ctx: | 772 | fail_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 | } |
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index a2b7de1c..8b322296 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -39,7 +39,7 @@ void gv11b_free_subctx_header(struct channel_gk20a *c) | |||
39 | gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va, | 39 | gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va, |
40 | ctx->mem.size, gk20a_mem_flag_none); | 40 | ctx->mem.size, gk20a_mem_flag_none); |
41 | 41 | ||
42 | gk20a_gmmu_free(g, &ctx->mem); | 42 | nvgpu_dma_free(g, &ctx->mem); |
43 | } | 43 | } |
44 | } | 44 | } |
45 | 45 | ||
@@ -53,7 +53,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
53 | gk20a_dbg_fn(""); | 53 | gk20a_dbg_fn(""); |
54 | 54 | ||
55 | if (ctx->mem.gpu_va == 0) { | 55 | if (ctx->mem.gpu_va == 0) { |
56 | ret = gk20a_gmmu_alloc_flags_sys(g, | 56 | ret = nvgpu_dma_alloc_flags_sys(g, |
57 | NVGPU_DMA_NO_KERNEL_MAPPING, | 57 | NVGPU_DMA_NO_KERNEL_MAPPING, |
58 | gr->ctx_vars.golden_image_size, | 58 | gr->ctx_vars.golden_image_size, |
59 | &ctx->mem); | 59 | &ctx->mem); |
@@ -71,7 +71,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
71 | if (!ctx->mem.gpu_va) { | 71 | if (!ctx->mem.gpu_va) { |
72 | gk20a_err(dev_from_gk20a(g), | 72 | gk20a_err(dev_from_gk20a(g), |
73 | "failed to map ctx header"); | 73 | "failed to map ctx header"); |
74 | gk20a_gmmu_free(g, &ctx->mem); | 74 | nvgpu_dma_free(g, &ctx->mem); |
75 | return -ENOMEM; | 75 | return -ENOMEM; |
76 | } | 76 | } |
77 | /* Now clear the buffer */ | 77 | /* Now clear the buffer */ |