summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_ib.c
diff options
context:
space:
mode:
authorChristian König <christian.koenig@amd.com>2014-08-27 15:21:56 +0200
committerAlex Deucher <alexander.deucher@amd.com>2014-08-27 22:47:19 +0200
commiteb98c709907c7a78b9cd0d18642477d47d348f9f (patch)
tree826a4b9312d0823edc7c9fe218bf005494319e28 /drivers/gpu/drm/radeon/radeon_ib.c
parentdrm/radeon: wake up all fences on manual reset (diff)
downloadlinux-eb98c709907c7a78b9cd0d18642477d47d348f9f.tar.xz
linux-eb98c709907c7a78b9cd0d18642477d47d348f9f.zip
drm/radeon: force fence completion only on problematic rings (v2)
Instead of resetting all fence numbers, only reset the number of the problematic ring. Split out from a patch from Maarten Lankhorst <maarten.lankhorst@canonical.com> v2 (agd5f): rebase build fix Signed-off-by: Christian König <christian.koenig@amd.com> Reviewed-by: Maarten Lankhorst <maarten.lankhorst@canonical.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_ib.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_ib.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_ib.c b/drivers/gpu/drm/radeon/radeon_ib.c
index 5bf2c0a05827..6fc7461d70c4 100644
--- a/drivers/gpu/drm/radeon/radeon_ib.c
+++ b/drivers/gpu/drm/radeon/radeon_ib.c
@@ -269,6 +269,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev)
r = radeon_ib_test(rdev, i, ring);
if (r) {
+ radeon_fence_driver_force_completion(rdev, i);
ring->ready = false;
rdev->needs_reset = false;