diff options
author | Dave Airlie <airlied@redhat.com> | 2009-07-23 23:47:45 -0400 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2009-07-29 01:59:49 -0400 |
commit | 3b170c3b2e688665fbc2845ba5bb4304bf38a119 (patch) | |
tree | c3d9395ecbc05d223f8cd9ef7f4ba20bba6fa474 /drivers/gpu/drm/radeon/radeon_object.c | |
parent | f121ecfebbea1452a17d57c656def7d1537440f7 (diff) |
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_object.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 81573c3a9b43..dd9ac2fed6d6 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c | |||
@@ -309,7 +309,7 @@ int radeon_object_wait(struct radeon_object *robj) | |||
309 | } | 309 | } |
310 | spin_lock(&robj->tobj.lock); | 310 | spin_lock(&robj->tobj.lock); |
311 | if (robj->tobj.sync_obj) { | 311 | if (robj->tobj.sync_obj) { |
312 | r = ttm_bo_wait(&robj->tobj, true, false, false); | 312 | r = ttm_bo_wait(&robj->tobj, true, true, false); |
313 | } | 313 | } |
314 | spin_unlock(&robj->tobj.lock); | 314 | spin_unlock(&robj->tobj.lock); |
315 | radeon_object_unreserve(robj); | 315 | radeon_object_unreserve(robj); |