lkml.org 
[lkml]   [2013]   [Jul]   [17]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 120/145] drm/nouveau: use vmalloc for pgt allocation
    Date
    3.8.13.5 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Marcin Slusarz <marcin.slusarz@gmail.com>

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/gpu/drm/nouveau/core/subdev/vm/base.c | 6 +++---
    1 file 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 77c67fc..e66fb77 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);
    }

    --
    1.8.1.2


    \
     
     \ /
      Last update: 2013-07-18 07:01    [W:4.047 / U:0.040 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site