Merge branch 'drm-next-4.13' of git://people.freedesktop.org/~agd5f/linux into drm...

[karo-tx-linux.git] / drivers / gpu / drm / amd / amdgpu / amdgpu_vm.c

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
index 9743db515e0bf772fb77288379a4393b9735ff81..5795f81369f0fc6e68f0659c400a700091713db8 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
@@ -286,8 +286,9 @@ static int amdgpu_vm_alloc_levels(struct amdgpu_device *adev,
        if (!parent->entries) {
                unsigned num_entries = amdgpu_vm_num_entries(adev, level);
 
-               parent->entries = drm_calloc_large(num_entries,
-                                                  sizeof(struct amdgpu_vm_pt));
+               parent->entries = kvmalloc_array(num_entries,
+                                                  sizeof(struct amdgpu_vm_pt),
+                                                  GFP_KERNEL | __GFP_ZERO);
                if (!parent->entries)
                        return -ENOMEM;
                memset(parent->entries, 0 , sizeof(struct amdgpu_vm_pt));
@@ -2491,7 +2492,7 @@ static void amdgpu_vm_free_levels(struct amdgpu_vm_pt *level)
                for (i = 0; i <= level->last_entry_used; i++)
                        amdgpu_vm_free_levels(&level->entries[i]);
 
-       drm_free_large(level->entries);
+       kvfree(level->entries);
 }
 
 /**