Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 ...aaaaand one more fix ...



details:   https://anonhg.NetBSD.org/src/rev/96a725040def
branches:  trunk
changeset: 336356:96a725040def
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Thu Feb 26 23:32:40 2015 +0000

description:
...aaaaand one more fix for __wait_seqno return value.

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_gem.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (17 lines):

diff -r 602d3d0800ec -r 96a725040def sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Thu Feb 26 23:27:41 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Thu Feb 26 23:32:40 2015 +0000
@@ -1463,9 +1463,11 @@
                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,



Home | Main Index | Thread Index | Old Index