Patch "drm/amdgpu: Use drm_calloc_large for VM page_tables array" has been added to the 4.4-stable tree
Subsystems (3)
This is a note to let you know that I've just added the patch titled
drm/amdgpu: Use drm_calloc_large for VM page_tables array
to the 4.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-amdgpu-use-drm_calloc_large-for-vm-page_tables-array.patch
and it can be found in the queue-4.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
9571e1d84042f5670df9fabdcbe7dd5da3abe43eMon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <[email protected]>
Date: Tue, 19 Jan 2016 17:59:46 +0900
Subject: 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
From: Michel Dänzer <[email protected]>
commit 9571e1d84042f5670df9fabdcbe7dd5da3abe43e upstream.
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
--- drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c +3 -4
@@ -1248,7 +1248,7 @@ int amdgpu_vm_init(struct amdgpu_device {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) {
@@ -1266,8 +1266,7 @@ int amdgpu_vm_init(struct amdgpu_device 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 ;
@@ -1327,7 +1326,7 @@ void amdgpu_vm_fini(struct amdgpu_devicefor (i =0 ; i <amdgpu_vm_num_pdes (adev); i++)amdgpu_bo_unref (&vm->page_tables[i].bo); -kfree (vm->page_tables); +drm_free_large (vm->page_tables);amdgpu_bo_unref (&vm->page_directory);fence_put (vm->page_directory_fence);
Patches currently in stable-queue which might be from [email protected] are
queue-4.4/drm-amdgpu-mask-out-wc-from-bo-on-unsupported-arches.patch queue-4.4/drm-amdgpu-use-drm_calloc_large-for-vm-page_tables-array.patch