summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index 6be616b3..81901c52 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -523,7 +523,7 @@ static void gk20a_free_channel(struct channel_gk20a *ch, bool force)
523 523
524 gk20a_gr_flush_channel_tlb(gr); 524 gk20a_gr_flush_channel_tlb(gr);
525 525
526 gk20a_gmmu_unmap_free(ch_vm, &ch->gpfifo.mem); 526 nvgpu_dma_unmap_free(ch_vm, &ch->gpfifo.mem);
527 nvgpu_big_free(g, ch->gpfifo.pipe); 527 nvgpu_big_free(g, ch->gpfifo.pipe);
528 memset(&ch->gpfifo, 0, sizeof(struct gpfifo_desc)); 528 memset(&ch->gpfifo, 0, sizeof(struct gpfifo_desc));
529 529
@@ -899,7 +899,7 @@ static int channel_gk20a_alloc_priv_cmdbuf(struct channel_gk20a *c)
899 size = roundup_pow_of_two(c->gpfifo.entry_num * 899 size = roundup_pow_of_two(c->gpfifo.entry_num *
900 2 * 18 * sizeof(u32) / 3); 900 2 * 18 * sizeof(u32) / 3);
901 901
902 err = gk20a_gmmu_alloc_map_sys(ch_vm, size, &q->mem); 902 err = nvgpu_dma_alloc_map_sys(ch_vm, size, &q->mem);
903 if (err) { 903 if (err) {
904 gk20a_err(d, "%s: memory allocation failed\n", __func__); 904 gk20a_err(d, "%s: memory allocation failed\n", __func__);
905 goto clean_up; 905 goto clean_up;
@@ -922,7 +922,7 @@ static void channel_gk20a_free_priv_cmdbuf(struct channel_gk20a *c)
922 if (q->size == 0) 922 if (q->size == 0)
923 return; 923 return;
924 924
925 gk20a_gmmu_unmap_free(ch_vm, &q->mem); 925 nvgpu_dma_unmap_free(ch_vm, &q->mem);
926 926
927 memset(q, 0, sizeof(struct priv_cmd_queue)); 927 memset(q, 0, sizeof(struct priv_cmd_queue));
928} 928}
@@ -1244,7 +1244,7 @@ int gk20a_channel_alloc_gpfifo(struct channel_gk20a *c,
1244 return -EEXIST; 1244 return -EEXIST;
1245 } 1245 }
1246 1246
1247 err = gk20a_gmmu_alloc_map_sys(ch_vm, 1247 err = nvgpu_dma_alloc_map_sys(ch_vm,
1248 gpfifo_size * sizeof(struct nvgpu_gpfifo), 1248 gpfifo_size * sizeof(struct nvgpu_gpfifo),
1249 &c->gpfifo.mem); 1249 &c->gpfifo.mem);
1250 if (err) { 1250 if (err) {
@@ -1331,7 +1331,7 @@ clean_up_sync:
1331 } 1331 }
1332clean_up_unmap: 1332clean_up_unmap:
1333 nvgpu_big_free(g, c->gpfifo.pipe); 1333 nvgpu_big_free(g, c->gpfifo.pipe);
1334 gk20a_gmmu_unmap_free(ch_vm, &c->gpfifo.mem); 1334 nvgpu_dma_unmap_free(ch_vm, &c->gpfifo.mem);
1335clean_up: 1335clean_up:
1336 memset(&c->gpfifo, 0, sizeof(struct gpfifo_desc)); 1336 memset(&c->gpfifo, 0, sizeof(struct gpfifo_desc));
1337 gk20a_err(d, "fail"); 1337 gk20a_err(d, "fail");