diff options
author | Konsta Holtta <kholtta@nvidia.com> | 2016-07-07 03:55:17 -0400 |
---|---|---|
committer | Deepak Nibade <dnibade@nvidia.com> | 2016-12-27 04:56:18 -0500 |
commit | e6b270e9e4a4d3e99871eaa5bd724a6110e93b5e (patch) | |
tree | 7a664a801d434b06625af1950ee27843cd1e0923 | |
parent | f34a8046d5f594f16eb29bc90a7ca49a66ef3c96 (diff) |
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>
-rw-r--r-- | drivers/gpu/nvgpu/gp106/acr_gp106.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 2 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/rpfb_gp10b.c | 2 |
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) | |||
1057 | err = -1; | 1057 | err = -1; |
1058 | goto err_release_acr_fw; | 1058 | goto err_release_acr_fw; |
1059 | } | 1059 | } |
1060 | err = gk20a_gmmu_alloc_map(vm, img_size_in_bytes, | 1060 | err = gk20a_gmmu_alloc_map_sys(vm, img_size_in_bytes, |
1061 | &acr->acr_ucode); | 1061 | &acr->acr_ucode); |
1062 | if (err) { | 1062 | if (err) { |
1063 | err = -ENOMEM; | 1063 | 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, | |||
827 | 827 | ||
828 | gk20a_dbg_fn(""); | 828 | gk20a_dbg_fn(""); |
829 | 829 | ||
830 | err = gk20a_gmmu_alloc_attr(vm->mm->g, 0, size, mem); | 830 | err = gk20a_gmmu_alloc_sys(vm->mm->g, size, mem); |
831 | if (err) | 831 | if (err) |
832 | return err; | 832 | return err; |
833 | 833 | ||
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) | |||
34 | gk20a_dbg_fn(""); | 34 | gk20a_dbg_fn(""); |
35 | 35 | ||
36 | if (!g->mm.bar2_desc.gpu_va) { | 36 | if (!g->mm.bar2_desc.gpu_va) { |
37 | err = gk20a_gmmu_alloc_map(vm, rbfb_size, | 37 | err = gk20a_gmmu_alloc_map_sys(vm, rbfb_size, |
38 | &g->mm.bar2_desc); | 38 | &g->mm.bar2_desc); |
39 | if (err) { | 39 | if (err) { |
40 | dev_err(dev_from_gk20a(g), | 40 | dev_err(dev_from_gk20a(g), |