Skip to content

Commit

Permalink
drm/radeon: hold reference to fences in radeon_sa_bo_new
Browse files Browse the repository at this point in the history
An arbitrary amount of time can pass between spin_unlock and
radeon_fence_wait_any, so we need to ensure that nobody frees the
fences from under us.

Based on the analogous fix for amdgpu.

Signed-off-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Cc: stable@vger.kernel.org
  • Loading branch information
Nicolai Hähnle authored and Alex Deucher committed Feb 10, 2016
1 parent b19763d commit f6ff4f6
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions drivers/gpu/drm/radeon/radeon_sa.c
Original file line number Diff line number Diff line change
Expand Up @@ -349,8 +349,13 @@ 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) {
Expand Down

0 comments on commit f6ff4f6

Please sign in to comment.