summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/radeon/radeon_fence.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2009-07-24 13:47:45 +1000
committerDave Airlie <airlied@redhat.com>2009-07-29 15:59:49 +1000
commit3b170c3b2e688665fbc2845ba5bb4304bf38a119 (patch)
treec3d9395ecbc05d223f8cd9ef7f4ba20bba6fa474 /drivers/gpu/drm/radeon/radeon_fence.c
parentf121ecfebbea1452a17d57c656def7d1537440f7 (diff)
downloadlinux-3b170c3b2e688665fbc2845ba5bb4304bf38a119.tar.bz2
drm/radeon/kms: allow interruptible waits for objects.
Blocking here isn't something the X server mouse appreciates, avoid the block and let userspace retry the waits. libdrm_radeon userspace library is also expecting EBUSY not ERESTART Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_fence.c')
-rw-r--r--drivers/gpu/drm/radeon/radeon_fence.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c
index 96afbf5ae2ad..b4e48dd2e859 100644
--- a/drivers/gpu/drm/radeon/radeon_fence.c
+++ b/drivers/gpu/drm/radeon/radeon_fence.c
@@ -195,7 +195,7 @@ retry:
r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
radeon_fence_signaled(fence), timeout);
if (unlikely(r == -ERESTARTSYS)) {
- return -ERESTART;
+ return -EBUSY;
}
} else {
r = wait_event_timeout(rdev->fence_drv.queue,