diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-03-21 18:34:50 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-06 21:15:04 -0400 |
commit | 50667e097b2be567e3d2f95e23b046243bca2bf6 (patch) | |
tree | e8fc42261868c6d69844f2e92fce33f6169434d4 /drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |
parent | 8f2d4a3f4a0acc81bae6725d30506e92651a42b5 (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/gk20a/ce2_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c index 9cc4b678..f3ac28ea 100644 --- a/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/ce2_gk20a.c | |||
@@ -195,7 +195,7 @@ static void gk20a_ce_delete_gpu_context(struct gk20a_gpu_ctx *ce_ctx) | |||
195 | 195 | ||
196 | if (ce_ctx->cmd_buf_mem.cpu_va) { | 196 | if (ce_ctx->cmd_buf_mem.cpu_va) { |
197 | gk20a_ce_free_command_buffer_stored_fence(ce_ctx); | 197 | gk20a_ce_free_command_buffer_stored_fence(ce_ctx); |
198 | gk20a_gmmu_unmap_free(ce_ctx->vm, &ce_ctx->cmd_buf_mem); | 198 | nvgpu_dma_unmap_free(ce_ctx->vm, &ce_ctx->cmd_buf_mem); |
199 | } | 199 | } |
200 | 200 | ||
201 | /* free the channel */ | 201 | /* free the channel */ |
@@ -479,7 +479,7 @@ u32 gk20a_ce_create_context_with_cb(struct device *dev, | |||
479 | } | 479 | } |
480 | 480 | ||
481 | /* allocate command buffer (4096 should be more than enough) from sysmem*/ | 481 | /* allocate command buffer (4096 should be more than enough) from sysmem*/ |
482 | err = gk20a_gmmu_alloc_map_sys(ce_ctx->vm, NVGPU_CE_COMMAND_BUF_SIZE, &ce_ctx->cmd_buf_mem); | 482 | err = nvgpu_dma_alloc_map_sys(ce_ctx->vm, NVGPU_CE_COMMAND_BUF_SIZE, &ce_ctx->cmd_buf_mem); |
483 | if (err) { | 483 | if (err) { |
484 | gk20a_err(ce_ctx->dev, | 484 | gk20a_err(ce_ctx->dev, |
485 | "ce: could not allocate command buffer for CE context"); | 485 | "ce: could not allocate command buffer for CE context"); |