summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
diff options
context:
space:
mode:
authorAlex Waterman <alexw@nvidia.com>2017-03-21 18:34:50 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-04-06 21:15:04 -0400
commit50667e097b2be567e3d2f95e23b046243bca2bf6 (patch)
treee8fc42261868c6d69844f2e92fce33f6169434d4 /drivers/gpu/nvgpu/vgpu/fifo_vgpu.c
parent8f2d4a3f4a0acc81bae6725d30506e92651a42b5 (diff)
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 <alexw@nvidia.com> Reviewed-on: http://git-master/r/1325548 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/vgpu/fifo_vgpu.c')
-rw-r--r--drivers/gpu/nvgpu/vgpu/fifo_vgpu.c6
1 files changed, 3 insertions, 3 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)
216 216
217 runlist_size = sizeof(u16) * f->num_channels; 217 runlist_size = sizeof(u16) * f->num_channels;
218 for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) { 218 for (i = 0; i < MAX_RUNLIST_BUFFERS; i++) {
219 int err = gk20a_gmmu_alloc_sys(g, runlist_size, 219 int err = nvgpu_dma_alloc_sys(g, runlist_size,
220 &runlist->mem[i]); 220 &runlist->mem[i]);
221 if (err) { 221 if (err) {
222 dev_err(d, "memory allocation failed\n"); 222 dev_err(d, "memory allocation failed\n");
@@ -260,7 +260,7 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
260 260
261 f->userd_entry_size = 1 << ram_userd_base_shift_v(); 261 f->userd_entry_size = 1 << ram_userd_base_shift_v();
262 262
263 err = gk20a_gmmu_alloc_sys(g, f->userd_entry_size * f->num_channels, 263 err = nvgpu_dma_alloc_sys(g, f->userd_entry_size * f->num_channels,
264 &f->userd); 264 &f->userd);
265 if (err) { 265 if (err) {
266 dev_err(d, "memory allocation failed\n"); 266 dev_err(d, "memory allocation failed\n");
@@ -327,7 +327,7 @@ static int vgpu_init_fifo_setup_sw(struct gk20a *g)
327clean_up: 327clean_up:
328 gk20a_dbg_fn("fail"); 328 gk20a_dbg_fn("fail");
329 /* FIXME: unmap from bar1 */ 329 /* FIXME: unmap from bar1 */
330 gk20a_gmmu_free(g, &f->userd); 330 nvgpu_dma_free(g, &f->userd);
331 331
332 memset(&f->userd, 0, sizeof(f->userd)); 332 memset(&f->userd, 0, sizeof(f->userd));
333 333