WebSVN – Kolibri OS – Diff – /drivers/video/drm/radeon/radeon_fence.c

+ *
  * @fence: radeon fence object
+ *
  * Check if the requested fence has signaled (all asics).
  * Returns true if the fence has signaled or false if it has not.
-				 */
+ */
 bool radeon_fence_signaled(struct radeon_fence *fence)
+{
 	if (!fence)
 		return true;
 	if (radeon_fence_any_seq_signaled(rdev, target_seq))
 		return timeout;
 	/* enable IRQs and tracing */
-		for (i = 0; i < RADEON_NUM_RINGS; ++i) {
+	for (i = 0; i < RADEON_NUM_RINGS; ++i) {
-			if (!target_seq[i])
+		if (!target_seq[i])
-				continue;
+			continue;
-			trace_radeon_fence_wait_begin(rdev->ddev, i, target_seq[i]);
+		trace_radeon_fence_wait_begin(rdev->ddev, i, target_seq[i]);
-			radeon_irq_kms_sw_irq_get(rdev, i);
+		radeon_irq_kms_sw_irq_get(rdev, i);
-        }
+	}
-		if (intr) {
+	if (intr) {
-			r = wait_event_interruptible_timeout(rdev->fence_queue, (
+		r = wait_event_interruptible_timeout(rdev->fence_queue, (
 			radeon_fence_any_seq_signaled(rdev, target_seq)
 			 || rdev->needs_reset), timeout);
-		} else {
+	} else {
-			r = wait_event_timeout(rdev->fence_queue, (
+		r = wait_event_timeout(rdev->fence_queue, (
 			radeon_fence_any_seq_signaled(rdev, target_seq)
 			 || rdev->needs_reset), timeout);
-        }
+	}
 	if (rdev->needs_reset)
 		r = -EDEADLK;
-		for (i = 0; i < RADEON_NUM_RINGS; ++i) {
+	for (i = 0; i < RADEON_NUM_RINGS; ++i) {
-			if (!target_seq[i])
+		if (!target_seq[i])
-				continue;
+			continue;
-			radeon_irq_kms_sw_irq_put(rdev, i);
+		radeon_irq_kms_sw_irq_put(rdev, i);
-			trace_radeon_fence_wait_end(rdev->ddev, i, target_seq[i]);
+		trace_radeon_fence_wait_end(rdev->ddev, i, target_seq[i]);
+	}
-            return r;
+	return r;
+}
 /**
- * radeon_fence_wait - wait for a fence to signal
+ * radeon_fence_wait_timeout - wait for a fence to signal with timeout
+ *
+ * @fence: radeon fence object
- *
+ * @intr: use interruptible sleep
  * @fence: radeon fence object
- * @intr: use interruptible sleep
+ * Wait for the requested fence to signal (all asics).
  * @intr selects whether to use interruptable (true) or non-interruptable
- * Wait for the requested fence to signal (all asics).
+ * (false) sleep when waiting for the fence.
- * @intr selects whether to use interruptable (true) or non-interruptable
+ * @timeout: maximum time to wait, or MAX_SCHEDULE_TIMEOUT for infinite wait
+ * Returns remaining time if the sequence number has passed, 0 when
- * (false) sleep when waiting for the fence.
+ * the wait timeout, or an error for all other cases.
- * Returns 0 if the fence has passed, error for all other cases.
+ */
- */
+long radeon_fence_wait_timeout(struct radeon_fence *fence, bool intr, long timeout)
 int radeon_fence_wait(struct radeon_fence *fence, bool intr)
 	 */
 	if (WARN_ON_ONCE(!to_radeon_fence(&fence->base)))
 		return fence_wait(&fence->base, intr);
 	seq[fence->ring] = fence->seq;
-	r = radeon_fence_wait_seq_timeout(fence->rdev, seq, intr, MAX_SCHEDULE_TIMEOUT);
+	r = radeon_fence_wait_seq_timeout(fence->rdev, seq, intr, timeout);
-	if (r < 0) {
+	if (r <= 0) {
-			return r;
+		return r;
 	}
-	r = fence_signal(&fence->base);
+	r_sig = fence_signal(&fence->base);
+	if (!r_sig)
+		FENCE_TRACE(&fence->base, "signaled from fence_wait\n");
+	return r;
+}
+/**
+ * radeon_fence_wait - wait for a fence to signal
+ *
+ * @fence: radeon fence object
+ * @intr: use interruptible 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.
+ */
+int radeon_fence_wait(struct radeon_fence *fence, bool intr)
+{
-	if (!r)
+	long r = radeon_fence_wait_timeout(fence, intr, MAX_SCHEDULE_TIMEOUT);
+	if (r > 0) {
+		return 0;
+	} else {
-		FENCE_TRACE(&fence->base, "signaled from fence_wait\n");
+		return r;
     return 0;
+}

Subversion Repositories Kolibri OS

(root)/drivers/video/drm/radeon/radeon_fence.c @ 1321 – Rev 6938 → 7146