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

Commit 676bc2e1 authored by Alex Deucher's avatar Alex Deucher
Browse files

Revert "drm/radeon: fix bo creation retry path" 



This reverts commit d1c7871d.

ttm_bo_init() destroys the BO on failure. So this patch makes
the retry path work with freed memory.  This ends up causing
kernel panics when this path is hit.

Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent c61e2775

drivers/gpu/drm/radeon/radeon_object.c

+1 −2
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ int radeon_bo_create(struct radeon_device *rdev, 
	acc_size = ttm_bo_dma_acc_size(&rdev->mman.bdev, size,

				       sizeof(struct radeon_bo));



retry:

	bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);

	if (bo == NULL)

		return -ENOMEM;
@@ -145,8 +146,6 @@ int radeon_bo_create(struct radeon_device *rdev, 
	bo->surface_reg = -1;

	INIT_LIST_HEAD(&bo->list);

	INIT_LIST_HEAD(&bo->va);



retry:

	radeon_ttm_placement_from_domain(bo, domain);

	/* Kernel allocation are uninterruptible */

	down_read(&rdev->pm.mclk_lock);