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/gp106/acr_gp106.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'drivers/gpu/nvgpu/gp106/acr_gp106.c') diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index 9acc8eda..631f9891 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c @@ -113,13 +113,13 @@ static int gp106_alloc_blob_space(struct gk20a *g, * Even though this mem_desc wouldn't be used, the wpr region needs to * be reserved in the allocator. */ - err = gk20a_gmmu_alloc_flags_vid_at(g, + err = nvgpu_dma_alloc_flags_vid_at(g, NVGPU_DMA_NO_KERNEL_MAPPING, wpr_inf.size, &g->acr.wpr_dummy, wpr_inf.wpr_base); if (err) return err; - return gk20a_gmmu_alloc_flags_vid_at(g, + return nvgpu_dma_alloc_flags_vid_at(g, NVGPU_DMA_NO_KERNEL_MAPPING, wpr_inf.size, mem, wpr_inf.nonwpr_base); } @@ -1094,7 +1094,7 @@ static int gp106_bootstrap_hs_flcn(struct gk20a *g) err = -1; goto err_release_acr_fw; } - err = gk20a_gmmu_alloc_map_sys(vm, img_size_in_bytes, + err = nvgpu_dma_alloc_map_sys(vm, img_size_in_bytes, &acr->acr_ucode); if (err) { err = -ENOMEM; @@ -1170,7 +1170,7 @@ static int gp106_bootstrap_hs_flcn(struct gk20a *g) return 0; err_free_ucode_map: - gk20a_gmmu_unmap_free(vm, &acr->acr_ucode); + nvgpu_dma_unmap_free(vm, &acr->acr_ucode); err_release_acr_fw: release_firmware(acr_fw); acr->acr_fw = NULL; -- cgit v1.2.2