summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_ring.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-02-18 15:58:31 +0100
committerChristian König <christian.koenig@amd.com>2014-02-28 10:53:18 +0100
commit37615527c5669f0c332534a797e5aaa175b6f3cb (patch)
tree5e7fdb06bb21f7e49210f81a1c8877693c5463aa /drivers/gpu/drm/radeon/radeon_ring.c
parentaee4aa73a1af3176cc3eea5833cae596b4b7dd22 (diff)
downloadlinux-stable-37615527c5669f0c332534a797e5aaa175b6f3cb.tar.gz
linux-stable-37615527c5669f0c332534a797e5aaa175b6f3cb.tar.bz2
linux-stable-37615527c5669f0c332534a797e5aaa175b6f3cb.zip
drm/radeon: cleanup the fence ring locking code
We no longer need to take the ring lock while checking for a gpu lockup, so just cleanup the code. Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ring.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 4c4810272371..fa140119cdb6 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -382,7 +382,7 @@ int radeon_ring_alloc(struct radeon_device *rdev, struct radeon_ring *ring, unsi
if (ndw < ring->ring_free_dw) {
break;
}
- r = radeon_fence_wait_next_locked(rdev, ring->idx);
+ r = radeon_fence_wait_next(rdev, ring->idx);
if (r)
return r;
}