gpu: nvgpu: use vidmem by default in gmmu_alloc variants

For devices that have vidmem available, use the vidmem allocator in
gk20a_gmmu_alloc{,attr,_map,_map_attr}. For others, use sysmem.

Because all of the buffers haven't been tested to work in vidmem yet,
rename calls to gk20a_gmmu_alloc{,attr,_map,_map_attr} to have _sys at
the end to declare explicitly that vidmem is used. Enabling vidmem for
each now is a matter of removing "_sys" from the function call.

Jira DNVGPU-18

Change-Id: I4a67eae403f1d9d271118c35e3775b1129170676
Signed-off-by: Konsta Holtta <kholtta@nvidia.com>
Reviewed-on: http://git-master/r/1176806
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

3 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c
index 5c4afef9..9364afec 100644
--- a/drivers/gpu/nvgpu/gp106/acr_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c
@@ -1057,7 +1057,7 @@ static int gp106_bootstrap_hs_flcn(struct gk20a *g)
                         err = -1;
                         goto err_release_acr_fw;
                 }
-                err = gk20a_gmmu_alloc_map(vm, img_size_in_bytes,
+                err = gk20a_gmmu_alloc_map_sys(vm, img_size_in_bytes,
                                 &acr->acr_ucode);
                 if (err) {
                         err = -ENOMEM;
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
index 6f5016cb..ff3c891f 100644
--- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c
@@ -827,7 +827,7 @@ int gr_gp10b_alloc_buffer(struct vm_gk20a *vm, size_t size,
 
         gk20a_dbg_fn("");
 
-        err = gk20a_gmmu_alloc_attr(vm->mm->g, 0, size, mem);
+        err = gk20a_gmmu_alloc_sys(vm->mm->g, size, mem);
         if (err)
                 return err;
 
diff --git a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c
index 59af5cde..f88718b6 100644
--- a/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c
@@ -34,7 +34,7 @@ int gp10b_replayable_pagefault_buffer_init(struct gk20a *g)
         gk20a_dbg_fn("");
 
         if (!g->mm.bar2_desc.gpu_va) {
-                err = gk20a_gmmu_alloc_map(vm, rbfb_size,
+                err = gk20a_gmmu_alloc_map_sys(vm, rbfb_size,
                                                 &g->mm.bar2_desc);
                 if (err) {
                         dev_err(dev_from_gk20a(g),