Skip to content

Commit

Permalink
Revert "drm/radeon: hold reference to fences in radeon_sa_bo_new"
Browse files Browse the repository at this point in the history
This reverts commit 8d5e1e5 which was
commit f6ff4f6 upstream.

It breaks working hardware, a backported version might be provided at
some unknown time in the future.

Reported-by: Erik Andersen <andersen@codepoet.org>
Acked-by: Christian König <christian.koenig@amd.com>
Cc: Nicolai Hähnle <nicolai.haehnle@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  • Loading branch information
Greg Kroah-Hartman committed Mar 9, 2016
1 parent 552b532 commit 3e04866
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions drivers/gpu/drm/radeon/radeon_sa.c
Original file line number Diff line number Diff line change
@@ -349,13 +349,8 @@ int radeon_sa_bo_new(struct radeon_device *rdev,
/* see if we can skip over some allocations */
} while (radeon_sa_bo_next_hole(sa_manager, fences, tries));

for (i = 0; i < RADEON_NUM_RINGS; ++i)
radeon_fence_ref(fences[i]);

spin_unlock(&sa_manager->wq.lock);
r = radeon_fence_wait_any(rdev, fences, false);
for (i = 0; i < RADEON_NUM_RINGS; ++i)
radeon_fence_unref(&fences[i]);
spin_lock(&sa_manager->wq.lock);
/* if we have nothing to wait for block */
if (r == -ENOENT && block) {

0 comments on commit 3e04866

Please sign in to comment.