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/cde_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/cde_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/cde_gk20a.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c index e70ee4a6..7c251e2d 100644 --- a/drivers/gpu/nvgpu/gk20a/cde_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/cde_gk20a.c | |||
@@ -54,7 +54,7 @@ static void gk20a_deinit_cde_img(struct gk20a_cde_ctx *cde_ctx) | |||
54 | 54 | ||
55 | for (i = 0; i < cde_ctx->num_bufs; i++) { | 55 | for (i = 0; i < cde_ctx->num_bufs; i++) { |
56 | struct nvgpu_mem *mem = cde_ctx->mem + i; | 56 | struct nvgpu_mem *mem = cde_ctx->mem + i; |
57 | gk20a_gmmu_unmap_free(cde_ctx->vm, mem); | 57 | nvgpu_dma_unmap_free(cde_ctx->vm, mem); |
58 | } | 58 | } |
59 | 59 | ||
60 | nvgpu_kfree(cde_ctx->g, cde_ctx->init_convert_cmd); | 60 | nvgpu_kfree(cde_ctx->g, cde_ctx->init_convert_cmd); |
@@ -247,7 +247,7 @@ static int gk20a_init_cde_buf(struct gk20a_cde_ctx *cde_ctx, | |||
247 | 247 | ||
248 | /* allocate buf */ | 248 | /* allocate buf */ |
249 | mem = cde_ctx->mem + cde_ctx->num_bufs; | 249 | mem = cde_ctx->mem + cde_ctx->num_bufs; |
250 | err = gk20a_gmmu_alloc_map_sys(cde_ctx->vm, buf->num_bytes, mem); | 250 | err = nvgpu_dma_alloc_map_sys(cde_ctx->vm, buf->num_bytes, mem); |
251 | if (err) { | 251 | if (err) { |
252 | gk20a_warn(cde_ctx->dev, "cde: could not allocate device memory. buffer idx = %d", | 252 | gk20a_warn(cde_ctx->dev, "cde: could not allocate device memory. buffer idx = %d", |
253 | cde_ctx->num_bufs); | 253 | cde_ctx->num_bufs); |