From 0dc66952e4df80b45c77bdbb31ce2a32f216328f Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 18 May 2015 13:37:54 -0700 Subject: gpu: nvgpu: Use vmalloc only when size >4K When allocation size is 4k or below, we should use kmalloc. vmalloc should be used only for larged allocations. Introduce nvgpu_alloc, which checks the size, and decides the API to use. Change-Id: I593110467cd319851b27e57d1bfe8d228d3f2909 Signed-off-by: Terje Bergstrom Reviewed-on: http://git-master/r/743974 (cherry picked from commit 7f56aa1f0ecafbfde7286353b60e25e494674d26) Reviewed-on: http://git-master/r/753276 Reviewed-by: Automatic_Commit_Validation_User --- drivers/gpu/nvgpu/gk20a/mm_gk20a.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'drivers/gpu/nvgpu/gk20a/mm_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c index a38db709..342d3ace 100644 --- a/drivers/gpu/nvgpu/gk20a/mm_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/mm_gk20a.c @@ -745,8 +745,8 @@ int gk20a_vm_get_buffers(struct vm_gk20a *vm, mutex_lock(&vm->update_gmmu_lock); - buffer_list = kzalloc(sizeof(*buffer_list) * - vm->num_user_mapped_buffers, GFP_KERNEL); + buffer_list = nvgpu_alloc(sizeof(*buffer_list) * + vm->num_user_mapped_buffers, true); if (!buffer_list) { mutex_unlock(&vm->update_gmmu_lock); return -ENOMEM; @@ -795,7 +795,7 @@ void gk20a_vm_put_buffers(struct vm_gk20a *vm, mutex_unlock(&vm->update_gmmu_lock); - kfree(mapped_buffers); + nvgpu_free(mapped_buffers); } static void gk20a_vm_unmap_user(struct vm_gk20a *vm, u64 offset) -- cgit v1.2.2