diff options
author | Sami Kiminki <skiminki@nvidia.com> | 2017-11-06 06:44:44 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-11-08 12:09:19 -0500 |
commit | 075852f042b9b3a3d48180378e6d2a709708cc41 (patch) | |
tree | 90253f69bf83caa10abc50638dc50bed3e53ab93 /drivers | |
parent | bcd78a0be617be07234e3ef4925cecaef66f2fa4 (diff) |
gpu: nvgpu: Switch to newer NVGPU_AS_MAP_BUFFER flags
Switch two cases using the old NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_*
flags to the newer definitions, that is,
NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE. The legacy NVGPU_MAP_BUFFER_FLAGS_*
definitions have been deleted.
Bug 1902982
Change-Id: Ifbd2678b10005b4af2375600888469b01dd09f4e
Signed-off-by: Sami Kiminki <skiminki@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1592655
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: Konsta Holtta <kholtta@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')
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 568673aa..22377522 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c | |||
@@ -1349,7 +1349,7 @@ int gr_gv11b_alloc_buffer(struct vm_gk20a *vm, size_t size, | |||
1349 | mem->gpu_va = nvgpu_gmmu_map(vm, | 1349 | mem->gpu_va = nvgpu_gmmu_map(vm, |
1350 | mem, | 1350 | mem, |
1351 | size, | 1351 | size, |
1352 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_TRUE, | 1352 | NVGPU_AS_MAP_BUFFER_FLAGS_CACHEABLE, |
1353 | gk20a_mem_flag_none, | 1353 | gk20a_mem_flag_none, |
1354 | false, | 1354 | false, |
1355 | mem->aperture); | 1355 | mem->aperture); |
diff --git a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c index 4951d3a4..864e24f0 100644 --- a/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/subctx_gv11b.c | |||
@@ -75,7 +75,7 @@ int gv11b_alloc_subctx_header(struct channel_gk20a *c) | |||
75 | ctx->mem.gpu_va = nvgpu_gmmu_map(c->vm, | 75 | ctx->mem.gpu_va = nvgpu_gmmu_map(c->vm, |
76 | &ctx->mem, | 76 | &ctx->mem, |
77 | ctx->mem.size, | 77 | ctx->mem.size, |
78 | NVGPU_MAP_BUFFER_FLAGS_CACHEABLE_FALSE, | 78 | 0, /* not GPU-cacheable */ |
79 | gk20a_mem_flag_none, true, | 79 | gk20a_mem_flag_none, true, |
80 | ctx->mem.aperture); | 80 | ctx->mem.aperture); |
81 | if (!ctx->mem.gpu_va) { | 81 | if (!ctx->mem.gpu_va) { |