Module Name: src
Committed By: riastradh
Date: Thu Feb 26 23:32:40 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_gem.c
Log Message:
...aaaaand one more fix for __wait_seqno return value.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 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.21 src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.22
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c:1.21 Thu Feb 26 19:43:43 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c Thu Feb 26 23:32:40 2015
@@ -1463,9 +1463,11 @@ __wait_seqno(struct intel_ring_buffer *r
if (ret == 0)
ret = -EAGAIN;
}
- if (ret < 0) /* Failure. */
+ if (ret < 0) /* Error. */
return ret;
- return 0; /* Success, possibly with time to spare. */
+ if (ret == 0) /* Seqno didn't pass. */
+ return -ETIME;
+ return 0; /* Seqno passed, maybe time to spare. */
}
#else
static int __wait_seqno(struct intel_ring_buffer *ring, u32 seqno,
