Module Name: src
Committed By: riastradh
Date: Thu Feb 26 14:10:14 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
Fix returned timeout in wait_seqno: remaining time, not time slept.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.19 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.20
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.19 Tue Dec 30 09:58:53 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Thu Feb 26 14:10:14 2015
@@ -1441,8 +1441,22 @@ __wait_seqno(struct intel_ring_buffer *r
if (!irq_test_in_progress)
ring->irq_put(ring);
- if (timeout)
- timespecsub(&after, &before, timeout);
+ if (timeout) {
+ struct timespec slept;
+
+ /* Compute slept = after - before. */
+ timespecsub(&after, &before, &slept);
+
+ /*
+ * Return the time remaining, timeout - slept, if we
+ * slept for less time than the timeout; or zero if we
+ * timed out.
+ */
+ if (timespeccmp(&slept, timeout, <))
+ timespecsub(timeout, &slept, timeout);
+ else
+ timespecclear(timeout);
+ }
return MAX(ret, 0); /* ignore remaining ticks */
}
#else
