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/css_gr_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/css_gr_gk20a.c')
-rw-r--r-- | drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c index 738e8c1c..e5910e7f 100644 --- a/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/css_gr_gk20a.c | |||
@@ -143,7 +143,7 @@ static int css_hw_enable_snapshot(struct channel_gk20a *ch, | |||
143 | if (snapshot_size < CSS_MIN_HW_SNAPSHOT_SIZE) | 143 | if (snapshot_size < CSS_MIN_HW_SNAPSHOT_SIZE) |
144 | snapshot_size = CSS_MIN_HW_SNAPSHOT_SIZE; | 144 | snapshot_size = CSS_MIN_HW_SNAPSHOT_SIZE; |
145 | 145 | ||
146 | ret = gk20a_gmmu_alloc_map_sys(&g->mm.pmu.vm, snapshot_size, | 146 | ret = nvgpu_dma_alloc_map_sys(&g->mm.pmu.vm, snapshot_size, |
147 | &data->hw_memdesc); | 147 | &data->hw_memdesc); |
148 | if (ret) | 148 | if (ret) |
149 | return ret; | 149 | return ret; |
@@ -192,7 +192,7 @@ static int css_hw_enable_snapshot(struct channel_gk20a *ch, | |||
192 | 192 | ||
193 | failed_allocation: | 193 | failed_allocation: |
194 | if (data->hw_memdesc.size) { | 194 | if (data->hw_memdesc.size) { |
195 | gk20a_gmmu_unmap_free(&g->mm.pmu.vm, &data->hw_memdesc); | 195 | nvgpu_dma_unmap_free(&g->mm.pmu.vm, &data->hw_memdesc); |
196 | memset(&data->hw_memdesc, 0, sizeof(data->hw_memdesc)); | 196 | memset(&data->hw_memdesc, 0, sizeof(data->hw_memdesc)); |
197 | } | 197 | } |
198 | data->hw_snapshot = NULL; | 198 | data->hw_snapshot = NULL; |
@@ -220,7 +220,7 @@ static void css_hw_disable_snapshot(struct gr_gk20a *gr) | |||
220 | perf_pmasys_mem_block_valid_false_f() | | 220 | perf_pmasys_mem_block_valid_false_f() | |
221 | perf_pmasys_mem_block_target_f(0)); | 221 | perf_pmasys_mem_block_target_f(0)); |
222 | 222 | ||
223 | gk20a_gmmu_unmap_free(&g->mm.pmu.vm, &data->hw_memdesc); | 223 | nvgpu_dma_unmap_free(&g->mm.pmu.vm, &data->hw_memdesc); |
224 | memset(&data->hw_memdesc, 0, sizeof(data->hw_memdesc)); | 224 | memset(&data->hw_memdesc, 0, sizeof(data->hw_memdesc)); |
225 | data->hw_snapshot = NULL; | 225 | data->hw_snapshot = NULL; |
226 | 226 | ||