Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/gpu/drm/radeon/radeon_fence.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ int radeon_fence_wait(struct radeon_fence *fence, bool interruptible) 
		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,

drivers/gpu/drm/radeon/radeon_object.c

+1 −1
Original line number Diff line number Diff line
@@ -309,7 +309,7 @@ int radeon_object_wait(struct radeon_object *robj) 
	}

	spin_lock(&robj->tobj.lock);

	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);

	radeon_object_unreserve(robj);