summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
diff options
context:
space:
mode:
authorKonsta Holtta <kholtta@nvidia.com>2016-07-07 03:36:46 -0400
committerTerje Bergstrom <tbergstrom@nvidia.com>2016-07-08 07:19:04 -0400
commitd33fb5a9645ef95a97fcf6b3f8f10d9a812ade6d (patch)
treecfd53a1fb88e044b8b7004ff9b32f1093efd4f1c /drivers/gpu/nvgpu/gk20a/channel_gk20a.c
parente27c72446bf09196d6d66f28389f00565273a13f (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: Ibe42f67eff2c2b68c36582e978ace419dc815dc5 Signed-off-by: Konsta Holtta <kholtta@nvidia.com> Reviewed-on: http://git-master/r/1176805 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/channel_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/channel_gk20a.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
index ad452919..1439410e 100644
--- a/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/channel_gk20a.c
@@ -1327,7 +1327,7 @@ static int channel_gk20a_alloc_priv_cmdbuf(struct channel_gk20a *c)
1327 size = roundup_pow_of_two(c->gpfifo.entry_num * 1327 size = roundup_pow_of_two(c->gpfifo.entry_num *
1328 2 * 18 * sizeof(u32) / 3); 1328 2 * 18 * sizeof(u32) / 3);
1329 1329
1330 err = gk20a_gmmu_alloc_map(ch_vm, size, &q->mem); 1330 err = gk20a_gmmu_alloc_map_sys(ch_vm, size, &q->mem);
1331 if (err) { 1331 if (err) {
1332 gk20a_err(d, "%s: memory allocation failed\n", __func__); 1332 gk20a_err(d, "%s: memory allocation failed\n", __func__);
1333 goto clean_up; 1333 goto clean_up;
@@ -1464,7 +1464,7 @@ int gk20a_alloc_channel_gpfifo(struct channel_gk20a *c,
1464 return -EEXIST; 1464 return -EEXIST;
1465 } 1465 }
1466 1466
1467 err = gk20a_gmmu_alloc_map(ch_vm, 1467 err = gk20a_gmmu_alloc_map_sys(ch_vm,
1468 gpfifo_size * sizeof(struct nvgpu_gpfifo), 1468 gpfifo_size * sizeof(struct nvgpu_gpfifo),
1469 &c->gpfifo.mem); 1469 &c->gpfifo.mem);
1470 if (err) { 1470 if (err) {