Commit 2744f4e7 authored by Alex Deucher's avatar Alex Deucher Committed by Ben Hutchings

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

commit 676bc2e1 upstream.

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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 9d16d84d
...@@ -117,6 +117,7 @@ int radeon_bo_create(struct radeon_device *rdev, ...@@ -117,6 +117,7 @@ int radeon_bo_create(struct radeon_device *rdev,
return -ENOMEM; return -ENOMEM;
} }
retry:
bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL); bo = kzalloc(sizeof(struct radeon_bo), GFP_KERNEL);
if (bo == NULL) if (bo == NULL)
return -ENOMEM; return -ENOMEM;
...@@ -129,8 +130,6 @@ int radeon_bo_create(struct radeon_device *rdev, ...@@ -129,8 +130,6 @@ int radeon_bo_create(struct radeon_device *rdev,
bo->gem_base.driver_private = NULL; bo->gem_base.driver_private = NULL;
bo->surface_reg = -1; bo->surface_reg = -1;
INIT_LIST_HEAD(&bo->list); INIT_LIST_HEAD(&bo->list);
retry:
radeon_ttm_placement_from_domain(bo, domain); radeon_ttm_placement_from_domain(bo, domain);
/* Kernel allocation are uninterruptible */ /* Kernel allocation are uninterruptible */
mutex_lock(&rdev->vram_mutex); mutex_lock(&rdev->vram_mutex);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment