diff options
| author | Marcin Slusarz <marcin.slusarz@gmail.com> | 2013-06-11 10:50:30 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 14:07:41 -0700 |
| commit | ef0cfe2f8ee92be33f891c238d310abfaca7e0e3 (patch) | |
| tree | c3b8ccf8bb6f34a01a2abc412cd6b83159c6c2ac | |
| parent | cd2c367cf10eab382c53bb9f39e01726c6f10253 (diff) | |
| download | linux-3.10-ef0cfe2f8ee92be33f891c238d310abfaca7e0e3.tar.gz linux-3.10-ef0cfe2f8ee92be33f891c238d310abfaca7e0e3.tar.bz2 linux-3.10-ef0cfe2f8ee92be33f891c238d310abfaca7e0e3.zip | |
drm/nouveau: use vmalloc for pgt allocation
commit d005f51eb93d71cd40ebd11dd377453fa8c8a42a upstream.
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>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 6 |
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 77c67fc970e..e66fb77131b 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/vm/base.c +++ b/drivers/gpu/drm/nouveau/core/subdev/vm/base.c @@ -362,7 +362,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, vm->fpde = offset >> (vmm->pgt_bits + 12); vm->lpde = (offset + length - 1) >> (vmm->pgt_bits + 12); - vm->pgt = kcalloc(vm->lpde - vm->fpde + 1, sizeof(*vm->pgt), GFP_KERNEL); + vm->pgt = vzalloc((vm->lpde - vm->fpde + 1) * sizeof(*vm->pgt)); if (!vm->pgt) { kfree(vm); return -ENOMEM; @@ -371,7 +371,7 @@ nouveau_vm_create(struct nouveau_vmmgr *vmm, u64 offset, u64 length, ret = nouveau_mm_init(&vm->mm, mm_offset >> 12, mm_length >> 12, block >> 12); if (ret) { - kfree(vm->pgt); + vfree(vm->pgt); kfree(vm); return ret; } @@ -446,7 +446,7 @@ nouveau_vm_del(struct nouveau_vm *vm) } nouveau_mm_fini(&vm->mm); - kfree(vm->pgt); + vfree(vm->pgt); kfree(vm); } |