From 50667e097b2be567e3d2f95e23b046243bca2bf6 Mon Sep 17 00:00:00 2001 From: Alex Waterman Date: Tue, 21 Mar 2017 15:34:50 -0700 Subject: gpu: nvgpu: Rename nvgpu DMA APIs Rename the nvgpu DMA APIs from gk20a_gmmu_alloc* to nvgpu_dma_alloc*. This better reflects the purpose of the APIs (to allocate DMA suitable memory) and avoids confusion with GMMU related code. JIRA NVGPU-12 Change-Id: I673d607db56dd6e44f02008dc7b5293209ef67bf Signed-off-by: Alex Waterman Reviewed-on: http://git-master/r/1325548 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/vgpu/fifo_vgpu.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/vgpu/fifo_vgpu.c') 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)); -- cgit v1.2.2