Attachment 121055 Details for Bug 93721 – drm/amdgpu: Use drm_calloc_large for VM page_tables array

[patch] drm/amdgpu: Use drm_calloc_large for VM page_tables array

0001-drm-amdgpu-Use-drm_calloc_large-for-VM-page_tables-a.patch (text/plain), 1.96 KB, created by Michel Dänzer on 2016-01-15 03:45:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2016-01-15 03:45:41 UTC

Size: 1.96 KB

patch

obsolete

>From 958d0923914b5ac865fdd8aa1f3f5caeb5e7c399 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com>
>Date: Fri, 15 Jan 2016 12:43:08 +0900
>Subject: [PATCH] drm/amdgpu: Use drm_calloc_large for VM page_tables array
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>It can be big, depending on the VM address space size, which is tunable
>via the vm_size module parameter.
>
>Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=93721
>Signed-off-by: Michel DÃ¤nzer <michel.daenzer@amd.com>
>---
> drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +++----
> 1 file changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>index aefc668..9599f75 100644
>--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
>@@ -1282,7 +1282,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
> {
> 	const unsigned align = min(AMDGPU_VM_PTB_ALIGN_SIZE,
> 		AMDGPU_VM_PTE_COUNT * 8);
>-	unsigned pd_size, pd_entries, pts_size;
>+	unsigned pd_size, pd_entries;
> 	int i, r;
> 
> 	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {
>@@ -1300,8 +1300,7 @@ int amdgpu_vm_init(struct amdgpu_device *adev, struct amdgpu_vm *vm)
> 	pd_entries = amdgpu_vm_num_pdes(adev);
> 
> 	/* allocate page table array */
>-	pts_size = pd_entries * sizeof(struct amdgpu_vm_pt);
>-	vm->page_tables = kzalloc(pts_size, GFP_KERNEL);
>+	vm->page_tables = drm_calloc_large(pd_entries, sizeof(struct amdgpu_vm_pt));
> 	if (vm->page_tables == NULL) {
> 		DRM_ERROR("Cannot allocate memory for page table array\n");
> 		return -ENOMEM;
>@@ -1361,7 +1360,7 @@ void amdgpu_vm_fini(struct amdgpu_device *adev, struct amdgpu_vm *vm)
> 
> 	for (i = 0; i < amdgpu_vm_num_pdes(adev); i++)
> 		amdgpu_bo_unref(&vm->page_tables[i].entry.robj);
>-	kfree(vm->page_tables);
>+	drm_free_large(vm->page_tables);
> 
> 	amdgpu_bo_unref(&vm->page_directory);
> 	fence_put(vm->page_directory_fence);
>-- 
>2.6.2
>

Actions: View | Splinter Review

Attachments on bug 93721: 121052 | 121053 | 121055

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.