Commit 3b170c3b authored by Dave Airlie's avatar Dave Airlie

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: default avatarDave Airlie <airlied@redhat.com>
parent f121ecfe
...@@ -195,7 +195,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible) ...@@ -195,7 +195,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible)
r = wait_event_interruptible_timeout(rdev->fence_drv.queue, r = wait_event_interruptible_timeout(rdev->fence_drv.queue,
radeon_fence_signaled(fence), timeout); radeon_fence_signaled(fence), timeout);
if (unlikely(r == -ERESTARTSYS)) { if (unlikely(r == -ERESTARTSYS)) {
return -ERESTART; return -EBUSY;
} }
} else { } else {
r = wait_event_timeout(rdev->fence_drv.queue, r = wait_event_timeout(rdev->fence_drv.queue,
......
...@@ -309,7 +309,7 @@ int radeon_object_wait(struct radeon_object *robj) ...@@ -309,7 +309,7 @@ int radeon_object_wait(struct radeon_object *robj)
} }
spin_lock(&robj->tobj.lock); spin_lock(&robj->tobj.lock);
if (robj->tobj.sync_obj) { if (robj->tobj.sync_obj) {
r = ttm_bo_wait(&robj->tobj, true, false, false); r = ttm_bo_wait(&robj->tobj, true, true, false);
} }
spin_unlock(&robj->tobj.lock); spin_unlock(&robj->tobj.lock);
radeon_object_unreserve(robj); radeon_object_unreserve(robj);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment