aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorMarcin Slusarz <marcin.slusarz@gmail.com>2013-06-11 04:50:30 -0400
committerBen Skeggs <bskeggs@redhat.com>2013-07-04 23:48:41 -0400
commitd005f51eb93d71cd40ebd11dd377453fa8c8a42a (patch)
tree8bc9d8ad5fbde704d5d39d8fcd933fd0cd24e004 /drivers/gpu
parent5c5ae7157d78e59e062dd35fbe9dec4de852bec2 (diff)
drm/nouveau: use vmalloc for pgt allocation
Page tables on nv50 take 48kB, which can be hard to allocate in one piece. Let's use vmalloc. Signed-off-by: Marcin Slusarz <marcin.slusarz@gmail.com> Cc: stable@vger.kernel.org [3.7+] Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/core/subdev/vm/base.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c
index 34d3fbfbd631..67fcb6c852ac 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c
@@ -365,7 +365,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length,
365 vm->fpde = offset >> (vmm->pgt_bits + 12); 365 vm->fpde = offset >> (vmm->pgt_bits + 12);
366 vm->lpde = (offset + length - 1) >> (vmm->pgt_bits + 12); 366 vm->lpde = (offset + length - 1) >> (vmm->pgt_bits + 12);
367 367
368 vm->pgt = kcalloc(vm->lpde - vm->fpde + 1, sizeof(*vm->pgt), GFP_KERNEL); 368 vm->pgt = vzalloc((vm->lpde - vm->fpde + 1) * sizeof(*vm->pgt));
369 if (!vm->pgt) { 369 if (!vm->pgt) {
370 kfree(vm); 370 kfree(vm);
371 return -ENOMEM; 371 return -ENOMEM;
@@ -374,7 +374,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length,
374 ret = nouveau_mm_init(&vm->mm, mm_offset >> 12, mm_length >> 12, 374 ret = nouveau_mm_init(&vm->mm, mm_offset >> 12, mm_length >> 12,
375 block >> 12); 375 block >> 12);
376 if (ret) { 376 if (ret) {
377 kfree(vm->pgt); 377 vfree(vm->pgt);
378 kfree(vm); 378 kfree(vm);
379 return ret; 379 return ret;
380 } 380 }
@@ -450,7 +450,7 @@ nouveau_vm_del(struct nouveau_vm *vm)
450 } 450 }
451 451
452 nouveau_mm_fini(&vm->mm); 452 nouveau_mm_fini(&vm->mm);
453 kfree(vm->pgt); 453 vfree(vm->pgt);
454 kfree(vm); 454 kfree(vm);
455} 455}
456 456