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

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

drm/radeon: Use drm_malloc_ab instead of kmalloc_array 

Should avoid kmalloc failures due to large number of array entries.

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=81991


Reviewed-by: default avatarDave Airlie <airlied@redhat.com>
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 6fa45593

drivers/gpu/drm/radeon/radeon_cs.c

+1 −1
Original line number Diff line number Diff line
@@ -450,7 +450,7 @@ static void radeon_cs_parser_fini(struct radeon_cs_parser *parser, int error, bo 
	kfree(parser->track);

	kfree(parser->relocs);

	kfree(parser->relocs_ptr);

	kfree(parser->vm_bos);

	drm_free_large(parser->vm_bos);

	for (i = 0; i < parser->nchunks; i++)

		drm_free_large(parser->chunks[i].kdata);

	kfree(parser->chunks);

drivers/gpu/drm/radeon/radeon_ring.c

+2 −2
Original line number Diff line number Diff line
@@ -314,7 +314,7 @@ unsigned radeon_ring_backup(struct radeon_device *rdev, struct radeon_ring *ring 
	}



	/* and then save the content of the ring */

	*data = kmalloc_array(size, sizeof(uint32_t), GFP_KERNEL);

	*data = drm_malloc_ab(size, sizeof(uint32_t));

	if (!*data) {

		mutex_unlock(&rdev->ring_lock);

		return 0;
@@ -356,7 +356,7 @@ int radeon_ring_restore(struct radeon_device *rdev, struct radeon_ring *ring, 
	}



	radeon_ring_unlock_commit(rdev, ring, false);

	kfree(data);

	drm_free_large(data);

	return 0;

}

drivers/gpu/drm/radeon/radeon_vm.c

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,8 @@ struct radeon_cs_reloc *radeon_vm_get_bos(struct radeon_device *rdev, 
	struct radeon_cs_reloc *list;

	unsigned i, idx;



	list = kmalloc_array(vm->max_pde_used + 2,

			     sizeof(struct radeon_cs_reloc), GFP_KERNEL);

	list = drm_malloc_ab(vm->max_pde_used + 2,

			     sizeof(struct radeon_cs_reloc));

	if (!list)

		return NULL;