Mon Mar 2 17:53:00 2015 UTC ()

Return the error if there is one in radeon_fence_wait_seq.

Don't just always say we succeeded!


(riastradh)

diff -r1.5 -r1.6 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c

--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c 2014/08/06 22:12:51	1.5
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_fence.c 2015/03/02 17:53:00	1.6

 @@ -313,27 +313,27 @@ static bool radeon_fence_any_seq_signale
  * Wait for the requested sequence number(s) to be written by any ring
  * (all asics).  Sequnce number array is indexed by ring id.
  * @intr selects whether to use interruptable (true) or non-interruptable
  * (false) sleep when waiting for the sequence number.  Helper function
  * for radeon_fence_wait_*().
  * Returns 0 if the sequence number has passed, error for all other cases.
  * -EDEADLK is returned when a GPU lockup has been detected.
  */
 static int radeon_fence_wait_seq(struct radeon_device *rdev, u64 *target_seq,
 				 bool intr)
+{
 	uint64_t last_seq[RADEON_NUM_RINGS];
 	bool signaled;
-	int i, r;
+	int i, r = 0;
 	spin_lock(&rdev->fence_lock);
 	while (!radeon_fence_any_seq_signaled(rdev, target_seq)) {
 		/* Save current sequence values, used to check for GPU lockups */
 		for (i = 0; i < RADEON_NUM_RINGS; ++i) {
 			if (!target_seq[i])
 				continue;
 			last_seq[i] = atomic64_read(&rdev->fence_drv[i].last_seq);
 			trace_radeon_fence_wait_begin(rdev->ddev, i, target_seq[i]);
 			radeon_irq_kms_sw_irq_get(rdev, i);
+		}
 @@ -415,27 +415,27 @@ static int radeon_fence_wait_seq(struct
 				rdev->needs_reset = true;
 #ifdef __NetBSD__
 				DRM_SPIN_WAKEUP_ALL(&rdev->fence_queue,
 				    &rdev->fence_lock);
 #else
 				wake_up_all(&rdev->fence_queue);
 #endif
 				r = -EDEADLK;
 				goto out;
+			}
+		}
+	}
 out:	spin_unlock(&rdev->fence_lock);
-	return 0;
+	return r;
+}
 /**
  * radeon_fence_wait - wait for a fence to signal
+ *
  * @fence: radeon fence object
  * @intr: use interruptable sleep
+ *
  * Wait for the requested fence to signal (all asics).
  * @intr selects whether to use interruptable (true) or non-interruptable
  * (false) sleep when waiting for the fence.
  * Returns 0 if the fence has passed, error for all other cases.
  */