2 files changed, 7 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
index 59fb0c4a..e2883f7c 100644
--- a/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
@@ -216,7 +216,7 @@ static int init_runlist(struct gk20a *g, struct fifo_gk20a *f)
 
                         runlist_size  = sizeof(u16) * f->num_channels;
                         for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) {
-                                int err = gk20a_gmmu_alloc_sys(g, runlist_size,
+                                int err = nvgpu_dma_alloc_sys(g, runlist_size,
                                                 &runlist->mem[i]);
                                 if (err) {
                                         dev_err(d, "memory allocation failed\n");
@@ -260,7 +260,7 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
 
         f->userd_entry_size = 1 << ram_userd_base_shift_v();
 
-        err = gk20a_gmmu_alloc_sys(g, f->userd_entry_size * f->num_channels,
+        err = nvgpu_dma_alloc_sys(g, f->userd_entry_size * f->num_channels,
                         &f->userd);
         if (err) {
                 dev_err(d, "memory allocation failed\n");
@@ -327,7 +327,7 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
 clean_up:
         gk20a_dbg_fn("fail");
         /* FIXME: unmap from bar1 */
-        gk20a_gmmu_free(g, &f->userd);
+        nvgpu_dma_free(g, &f->userd);
 
         memset(&f->userd, 0, sizeof(f->userd));
 
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
index 527e12e4..da41abd4 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
@@ -42,10 +42,10 @@ static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
         gk20a_vm_free_va(vm, gr_ctx->mem.gpu_va, gr_ctx->mem.size,
                         gmmu_page_size_kernel);
 
-        gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer);
-        gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer);
-        gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer);
-        gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer);
+        nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer);
 
         nvgpu_kfree(g, gr_ctx);
 }