diff options
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 18 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | 4 |
2 files changed, 11 insertions, 11 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index b9367120..c1cb1376 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -839,7 +839,7 @@ int gr_gp10b_alloc_buffer(struct vm_gk20a *vm, size_t size, | |||
839 | 839 | ||
840 | gk20a_dbg_fn(""); | 840 | gk20a_dbg_fn(""); |
841 | 841 | ||
842 | err = gk20a_gmmu_alloc_sys(vm->mm->g, size, mem); | 842 | err = nvgpu_dma_alloc_sys(vm->mm->g, size, mem); |
843 | if (err) | 843 | if (err) |
844 | return err; | 844 | return err; |
845 | 845 | ||
@@ -859,7 +859,7 @@ int gr_gp10b_alloc_buffer(struct vm_gk20a *vm, size_t size, | |||
859 | return 0; | 859 | return 0; |
860 | 860 | ||
861 | fail_free: | 861 | fail_free: |
862 | gk20a_gmmu_free(vm->mm->g, mem); | 862 | nvgpu_dma_free(vm->mm->g, mem); |
863 | return err; | 863 | return err; |
864 | } | 864 | } |
865 | 865 | ||
@@ -980,11 +980,11 @@ static int gr_gp10b_set_ctxsw_preemption_mode(struct gk20a *g, | |||
980 | return 0; | 980 | return 0; |
981 | 981 | ||
982 | fail_free_betacb: | 982 | fail_free_betacb: |
983 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer); | 983 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer); |
984 | fail_free_spill: | 984 | fail_free_spill: |
985 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer); | 985 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer); |
986 | fail_free_preempt: | 986 | fail_free_preempt: |
987 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer); | 987 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer); |
988 | fail: | 988 | fail: |
989 | return err; | 989 | return err; |
990 | } | 990 | } |
@@ -1098,10 +1098,10 @@ static void gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm, | |||
1098 | if (g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close) | 1098 | if (g->gr.t18x.ctx_vars.dump_ctxsw_stats_on_channel_close) |
1099 | dump_ctx_switch_stats(g, vm, gr_ctx); | 1099 | dump_ctx_switch_stats(g, vm, gr_ctx); |
1100 | 1100 | ||
1101 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer); | 1101 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer); |
1102 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer); | 1102 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer); |
1103 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer); | 1103 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.spill_ctxsw_buffer); |
1104 | gk20a_gmmu_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer); | 1104 | nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.preempt_ctxsw_buffer); |
1105 | gr_gk20a_free_gr_ctx(g, vm, gr_ctx); | 1105 | gr_gk20a_free_gr_ctx(g, vm, gr_ctx); |
1106 | gk20a_dbg_fn("done"); | 1106 | gk20a_dbg_fn("done"); |
1107 | } | 1107 | } |
diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c index bf52b5c9..e8f3d930 100644 --- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | |||
@@ -39,7 +39,7 @@ int gp10b_replayable_pagefault_buffer_init(struct gk20a *g) | |||
39 | gk20a_dbg_fn(""); | 39 | gk20a_dbg_fn(""); |
40 | 40 | ||
41 | if (!g->mm.bar2_desc.gpu_va) { | 41 | if (!g->mm.bar2_desc.gpu_va) { |
42 | err = gk20a_gmmu_alloc_map_sys(vm, rbfb_size, | 42 | err = nvgpu_dma_alloc_map_sys(vm, rbfb_size, |
43 | &g->mm.bar2_desc); | 43 | &g->mm.bar2_desc); |
44 | if (err) { | 44 | if (err) { |
45 | dev_err(dev_from_gk20a(g), | 45 | dev_err(dev_from_gk20a(g), |
@@ -63,7 +63,7 @@ void gp10b_replayable_pagefault_buffer_deinit(struct gk20a *g) | |||
63 | { | 63 | { |
64 | struct vm_gk20a *vm = &g->mm.bar2.vm; | 64 | struct vm_gk20a *vm = &g->mm.bar2.vm; |
65 | 65 | ||
66 | gk20a_gmmu_unmap_free(vm, &g->mm.bar2_desc); | 66 | nvgpu_dma_unmap_free(vm, &g->mm.bar2_desc); |
67 | } | 67 | } |
68 | 68 | ||
69 | u32 gp10b_replayable_pagefault_buffer_get_index(struct gk20a *g) | 69 | u32 gp10b_replayable_pagefault_buffer_get_index(struct gk20a *g) |