Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9571e1d8 authored by Michel Dänzer's avatar Michel Dänzer Committed by Alex Deucher
Browse files

drm/amdgpu: Use drm_calloc_large for VM page_tables array 

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


Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 7776a693

drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c

+3 −4
Original line number Original line Diff line number Diff line
@@ -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,

	const unsigned align = min(AMDGPU_VM_PTB_ALIGN_SIZE,

		AMDGPU_VM_PTE_COUNT * 8);

		AMDGPU_VM_PTE_COUNT * 8);

	unsigned pd_size, pd_entries, pts_size;

	unsigned pd_size, pd_entries;

	int i, r;

	int i, r;





	for (i = 0; i < AMDGPU_MAX_RINGS; ++i) {

	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);

	pd_entries = amdgpu_vm_num_pdes(adev);





	/* allocate page table array */

	/* allocate page table array */

	pts_size = pd_entries * sizeof(struct amdgpu_vm_pt);

	vm->page_tables = drm_calloc_large(pd_entries, sizeof(struct amdgpu_vm_pt));

	vm->page_tables = kzalloc(pts_size, GFP_KERNEL);

	if (vm->page_tables == NULL) {

	if (vm->page_tables == NULL) {

		DRM_ERROR("Cannot allocate memory for page table array\n");

		DRM_ERROR("Cannot allocate memory for page table array\n");

		return -ENOMEM;

		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++)

	for (i = 0; i < amdgpu_vm_num_pdes(adev); i++)

		amdgpu_bo_unref(&vm->page_tables[i].entry.robj);

		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);

	amdgpu_bo_unref(&vm->page_directory);

	fence_put(vm->page_directory_fence);

	fence_put(vm->page_directory_fence);