diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2018-06-26 05:44:21 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-06-28 14:13:50 -0400 |
commit | dc1e91a2d7af365b878418d427fb16e4d0192028 (patch) | |
tree | 1832d3c5519a6ec42b047c76bb6df7157fe345b0 /drivers/gpu/nvgpu/common | |
parent | 5c9bb32adba32c5cd3b0466b50206aa1b7dd7d2c (diff) |
gpu: nvgpu: don't nvgpu_mem_{begin,end}() sim bufs
nvgpu_dma_alloc_sys() gives cpu-mapped memory by default. Remove the
explicit calls to map and unmap the sim buffers.
Change-Id: Icf71961c16a8b2f5dae24382cc927c7a802a769a
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1761580
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/common')
-rw-r--r-- | drivers/gpu/nvgpu/common/sim.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/nvgpu/common/sim.c b/drivers/gpu/nvgpu/common/sim.c index 81146cd9..c46f0959 100644 --- a/drivers/gpu/nvgpu/common/sim.c +++ b/drivers/gpu/nvgpu/common/sim.c | |||
@@ -31,28 +31,13 @@ | |||
31 | 31 | ||
32 | int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem) | 32 | int nvgpu_alloc_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem) |
33 | { | 33 | { |
34 | int err; | 34 | return nvgpu_dma_alloc_sys(g, PAGE_SIZE, mem); |
35 | |||
36 | err = nvgpu_dma_alloc_sys(g, PAGE_SIZE, mem); | ||
37 | if (err) | ||
38 | return err; | ||
39 | /* | ||
40 | * create a valid cpu_va mapping | ||
41 | */ | ||
42 | nvgpu_mem_begin(g, mem); | ||
43 | |||
44 | return 0; | ||
45 | } | 35 | } |
46 | 36 | ||
47 | void nvgpu_free_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem) | 37 | void nvgpu_free_sim_buffer(struct gk20a *g, struct nvgpu_mem *mem) |
48 | { | 38 | { |
49 | if (nvgpu_mem_is_valid(mem)) { | 39 | if (nvgpu_mem_is_valid(mem)) |
50 | /* | ||
51 | * invalidate the cpu_va mapping | ||
52 | */ | ||
53 | nvgpu_mem_end(g, mem); | ||
54 | nvgpu_dma_free(g, mem); | 40 | nvgpu_dma_free(g, mem); |
55 | } | ||
56 | 41 | ||
57 | memset(mem, 0, sizeof(*mem)); | 42 | memset(mem, 0, sizeof(*mem)); |
58 | } | 43 | } |