Attachment 107967 Details for Bug 81991 – drm/radeon: Use drm_malloc_ab instead of kmalloc_array

drm/radeon: Use drm_malloc_ab instead of kmalloc_array

radeon-kmalloc_array.diff (text/plain), 1.99 KB, created by Michel Dänzer on 2014-10-17 03:25:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Dänzer

Created: 2014-10-17 03:25:49 UTC

Size: 1.99 KB

patch

obsolete

>commit 5d679650d57b0a4c34ed012e9c22a91e813e68df
>Author: Michel DÃ¤nzer <michel.daenzer@amd.com>
>Date:   Fri Oct 17 12:15:45 2014 +0900
>
>    drm/radeon: Use drm_malloc_ab instead of kmalloc_array
>
>diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c
>index 1c89344..a3e7aed 100644
>--- a/drivers/gpu/drm/radeon/radeon_cs.c
>+++ b/drivers/gpu/drm/radeon/radeon_cs.c
>@@ -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);
>diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
>index 596e591..51dcf40 100644
>--- a/drivers/gpu/drm/radeon/radeon_ring.c
>+++ b/drivers/gpu/drm/radeon/radeon_ring.c
>@@ -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;
> }
> 
>diff --git a/drivers/gpu/drm/radeon/radeon_vm.c b/drivers/gpu/drm/radeon/radeon_vm.c
>index 4532cc7..dfde266 100644
>--- a/drivers/gpu/drm/radeon/radeon_vm.c
>+++ b/drivers/gpu/drm/radeon/radeon_vm.c
>@@ -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;
>

Actions: View

Attachments on bug 81991: 103787 | 107967

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.