diff options
author | Alex Waterman <alexw@nvidia.com> | 2017-04-04 19:08:52 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-04-06 21:15:15 -0400 |
commit | 1a426c981c4fa2816d969b27163ab2dbc2fa4e89 (patch) | |
tree | fba9c8688b88c512b7f1a87f457dec51cf6be49c /drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |
parent | 26159aed046393e5d01060323a76f838d2f5bba3 (diff) |
gpu: nvgpu: Rename nvgpu DMA APIs
gv11b changes to go along with
gpu: nvgpu: Rename nvgpu DMA APIs
In the main nvgpu repo.
JIRA NVGPU-12
Change-Id: I5e28b13448d171e1511ace0842e53700385f8489
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1455213
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Diffstat (limited to 'drivers/gpu/nvgpu/gv11b/subctx_gv11b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index a2b7de1c..8b322296 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -39,7 +39,7 @@ void gv11b_free_subctx_header(struct channel_gk20a *c) | |||
39 | gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va, | 39 | gk20a_gmmu_unmap(c->vm, ctx->mem.gpu_va, |
40 | ctx->mem.size, gk20a_mem_flag_none); | 40 | ctx->mem.size, gk20a_mem_flag_none); |
41 | 41 | ||
42 | gk20a_gmmu_free(g, &ctx->mem); | 42 | nvgpu_dma_free(g, &ctx->mem); |
43 | } | 43 | } |
44 | } | 44 | } |
45 | 45 | ||
@@ -53,7 +53,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
53 | gk20a_dbg_fn(""); | 53 | gk20a_dbg_fn(""); |
54 | 54 | ||
55 | if (ctx->mem.gpu_va == 0) { | 55 | if (ctx->mem.gpu_va == 0) { |
56 | ret = gk20a_gmmu_alloc_flags_sys(g, | 56 | ret = nvgpu_dma_alloc_flags_sys(g, |
57 | NVGPU_DMA_NO_KERNEL_MAPPING, | 57 | NVGPU_DMA_NO_KERNEL_MAPPING, |
58 | gr->ctx_vars.golden_image_size, | 58 | gr->ctx_vars.golden_image_size, |
59 | &ctx->mem); | 59 | &ctx->mem); |
@@ -71,7 +71,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
71 | if (!ctx->mem.gpu_va) { | 71 | if (!ctx->mem.gpu_va) { |
72 | gk20a_err(dev_from_gk20a(g), | 72 | gk20a_err(dev_from_gk20a(g), |
73 | "failed to map ctx header"); | 73 | "failed to map ctx header"); |
74 | gk20a_gmmu_free(g, &ctx->mem); | 74 | nvgpu_dma_free(g, &ctx->mem); |
75 | return -ENOMEM; | 75 | return -ENOMEM; |
76 | } | 76 | } |
77 | /* Now clear the buffer */ | 77 | /* Now clear the buffer */ |