From d512eab59c058223ce3cce717992561d06799e9f Mon Sep 17 00:00:00 2001
From: dumbbell <dumbbell@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Date: Sun, 22 Dec 2013 23:41:14 +0000
Subject: [PATCH] Merge from stable/10, r259742:

drm/ttm, drm/radeon: Replace EINTR/ERESTART by ERESTARTSYS...

... for msleep/cv_*wait() return values, where wait_event*() is used
on Linux. ERESTARTSYS is the return code expected by callers when the
operation was interrupted.

For instance, this is the case of radeon_cs_ioctl() (radeon_cs.c): if
an error occurs, and the code isn't ERESTARTSYS (eg. EINTR), it logs an
error.

Note that ERESTARTSYS is defined as ERESTART, but this keeps callers'
code close to Linux.

Submitted by:	avg@ (previous version)
Approved by:	re (gjb)


git-svn-id: svn://svn.freebsd.org/base/releng/10.0@259754 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
---
 sys/dev/drm2/radeon/radeon_fence.c | 8 ++++++--
 sys/dev/drm2/radeon/radeon_sa.c    | 2 ++
 sys/dev/drm2/ttm/ttm_bo.c          | 2 ++
 sys/dev/drm2/ttm/ttm_lock.c        | 8 ++++++++
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/sys/dev/drm2/radeon/radeon_fence.c b/sys/dev/drm2/radeon/radeon_fence.c
index 07b1a64b..3b43a8c4 100644
--- a/sys/dev/drm2/radeon/radeon_fence.c
+++ b/sys/dev/drm2/radeon/radeon_fence.c
@@ -321,6 +321,8 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 target_seq,
 				    &rdev->fence_queue_mtx,
 				    timeout);
 			}
+			if (r == EINTR)
+				r = ERESTARTSYS;
 			if (r != 0) {
 				if (r == EWOULDBLOCK) {
 					signaled =
@@ -334,7 +336,7 @@ static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 target_seq,
 			mtx_unlock(&rdev->fence_queue_mtx);
 		}
 		radeon_irq_kms_sw_irq_put(rdev, ring);
-		if (unlikely(r == EINTR || r == ERESTART)) {
+		if (unlikely(r == ERESTARTSYS)) {
 			return -r;
 		}
 		CTR2(KTR_DRM, "radeon fence: wait end (ring=%d, seq=%d)",
@@ -514,6 +516,8 @@ static int radeon_fence_wait_any_seq(struct radeon_device *rdev,
 				    &rdev->fence_queue_mtx,
 				    timeout);
 			}
+			if (r == EINTR)
+				r = ERESTARTSYS;
 			if (r != 0) {
 				if (r == EWOULDBLOCK) {
 					signaled =
@@ -531,7 +535,7 @@ static int radeon_fence_wait_any_seq(struct radeon_device *rdev,
 				radeon_irq_kms_sw_irq_put(rdev, i);
 			}
 		}
-		if (unlikely(r == EINTR || r == ERESTART)) {
+		if (unlikely(r == ERESTARTSYS)) {
 			return -r;
 		}
 		CTR2(KTR_DRM, "radeon fence: wait end (ring=%d, target_seq=%d)",
diff --git a/sys/dev/drm2/radeon/radeon_sa.c b/sys/dev/drm2/radeon/radeon_sa.c
index e7508126..25695a42 100644
--- a/sys/dev/drm2/radeon/radeon_sa.c
+++ b/sys/dev/drm2/radeon/radeon_sa.c
@@ -363,6 +363,8 @@ int radeon_sa_bo_new(struct radeon_device *rdev,
 			while (!radeon_sa_event(sa_manager, size, align)) {
 				r = -cv_wait_sig(&sa_manager->wq,
 				    &sa_manager->wq_lock);
+				if (r == -EINTR)
+					r = -ERESTARTSYS;
 				if (r != 0)
 					break;
 			}
diff --git a/sys/dev/drm2/ttm/ttm_bo.c b/sys/dev/drm2/ttm/ttm_bo.c
index 3b135404..88f374eb 100644
--- a/sys/dev/drm2/ttm/ttm_bo.c
+++ b/sys/dev/drm2/ttm/ttm_bo.c
@@ -147,6 +147,8 @@ ttm_bo_wait_unreserved_locked(struct ttm_buffer_object *bo, bool interruptible)
 	}
 	while (ttm_bo_is_reserved(bo)) {
 		ret = -msleep(bo, &bo->glob->lru_lock, flags, wmsg, 0);
+		if (ret == -EINTR)
+			ret = -ERESTARTSYS;
 		if (ret != 0)
 			break;
 	}
diff --git a/sys/dev/drm2/ttm/ttm_lock.c b/sys/dev/drm2/ttm/ttm_lock.c
index 8ec3041a..ae06565c 100644
--- a/sys/dev/drm2/ttm/ttm_lock.c
+++ b/sys/dev/drm2/ttm/ttm_lock.c
@@ -107,6 +107,8 @@ ttm_read_lock(struct ttm_lock *lock, bool interruptible)
 	mtx_lock(&lock->lock);
 	while (!__ttm_read_lock(lock)) {
 		ret = msleep(lock, &lock->lock, flags, wmsg, 0);
+		if (ret == EINTR)
+			ret = ERESTARTSYS;
 		if (ret != 0)
 			break;
 	}
@@ -151,6 +153,8 @@ int ttm_read_trylock(struct ttm_lock *lock, bool interruptible)
 	mtx_lock(&lock->lock);
 	while (!__ttm_read_trylock(lock, &locked)) {
 		ret = msleep(lock, &lock->lock, flags, wmsg, 0);
+		if (ret == EINTR)
+			ret = ERESTARTSYS;
 		if (ret != 0)
 			break;
 	}
@@ -204,6 +208,8 @@ ttm_write_lock(struct ttm_lock *lock, bool interruptible)
 	/* XXXKIB: linux uses __ttm_read_lock for uninterruptible sleeps */
 	while (!__ttm_write_lock(lock)) {
 		ret = msleep(lock, &lock->lock, flags, wmsg, 0);
+		if (ret == EINTR)
+			ret = ERESTARTSYS;
 		if (interruptible && ret != 0) {
 			lock->flags &= ~TTM_WRITE_LOCK_PENDING;
 			wakeup(lock);
@@ -280,6 +286,8 @@ int ttm_vt_lock(struct ttm_lock *lock,
 	mtx_lock(&lock->lock);
 	while (!__ttm_vt_lock(lock)) {
 		ret = msleep(lock, &lock->lock, flags, wmsg, 0);
+		if (ret == EINTR)
+			ret = ERESTARTSYS;
 		if (interruptible && ret != 0) {
 			lock->flags &= ~TTM_VT_LOCK_PENDING;
 			wakeup(lock);
-- 
2.42.0