[src/trunk]: src/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo More...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/1635e1c49c03
branches:  trunk
changeset: 336396:1635e1c49c03
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Feb 28 03:33:22 2015 +0000

description:
More DRM_TIMED_WAIT mistakes: 0, not -ETIMEDOUT, for timeout.

diffstat:

 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c |  6 +++---
 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c |  6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diffs (54 lines):

diff -r 28aef08a653f -r 1635e1c49c03 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c        Sat Feb 28 03:27:38 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c        Sat Feb 28 03:33:22 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_fifo_nvc0.c,v 1.2 2014/08/23 08:03:33 riastradh Exp $   */
+/*     $NetBSD: nouveau_engine_fifo_nvc0.c,v 1.3 2015/02/28 03:33:22 riastradh Exp $   */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.2 2014/08/23 08:03:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.3 2015/02/28 03:33:22 riastradh Exp $");
 
 #include <core/client.h>
 #include <core/handle.h>
@@ -122,7 +122,7 @@
        DRM_SPIN_TIMED_WAIT_UNTIL(ret, &priv->runlist.wait,
            &priv->runlist.lock, msecs_to_jiffies(2000),
            !(nv_rd32(priv, 0x00227c) & 0x00100000));
-       if (ret == -ETIMEDOUT)
+       if (ret == 0)
                nv_error(priv, "runlist update timeout\n");
        spin_unlock(&priv->runlist.lock);
     }
diff -r 28aef08a653f -r 1635e1c49c03 sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c
--- a/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c        Sat Feb 28 03:27:38 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c        Sat Feb 28 03:33:22 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_fifo_nve0.c,v 1.2 2014/08/23 08:03:33 riastradh Exp $   */
+/*     $NetBSD: nouveau_engine_fifo_nve0.c,v 1.3 2015/02/28 03:33:22 riastradh Exp $   */
 
 /*
  * Copyright 2012 Red Hat Inc.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nve0.c,v 1.2 2014/08/23 08:03:33 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nve0.c,v 1.3 2015/02/28 03:33:22 riastradh Exp $");
 
 #include <core/client.h>
 #include <core/handle.h>
@@ -144,7 +144,7 @@
            msecs_to_jiffies(2000),
            !(nv_rd32(priv, 0x002284 +
                    (engine * 0x08)) & 0x00100000));
-       if (ret == -ETIMEDOUT)
+       if (ret == 0)
                nv_error(priv, "runlist %d update timeout\n", engine);
        spin_unlock(&engn->lock);
     }