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

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

details:   https://anonhg.NetBSD.org/src/rev/a5bbad6fb9ec
branches:  trunk
changeset: 336403:a5bbad6fb9ec
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Feb 28 05:38:49 2015 +0000

description:
These are uninterruptible upstream too.

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 cc0081ec7223 -r a5bbad6fb9ec 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 05:37:10 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nvc0.c        Sat Feb 28 05:38:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_fifo_nvc0.c,v 1.3 2015/02/28 03:33:22 riastradh Exp $   */
+/*     $NetBSD: nouveau_engine_fifo_nvc0.c,v 1.4 2015/02/28 05:38:49 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.3 2015/02/28 03:33:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nvc0.c,v 1.4 2015/02/28 05:38:49 riastradh Exp $");
 
 #include <core/client.h>
 #include <core/handle.h>
@@ -119,7 +119,7 @@
        int ret;
 
        spin_lock(&priv->runlist.lock);
-       DRM_SPIN_TIMED_WAIT_UNTIL(ret, &priv->runlist.wait,
+       DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, &priv->runlist.wait,
            &priv->runlist.lock, msecs_to_jiffies(2000),
            !(nv_rd32(priv, 0x00227c) & 0x00100000));
        if (ret == 0)
diff -r cc0081ec7223 -r a5bbad6fb9ec 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 05:37:10 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/nouveau/core/engine/fifo/nouveau_engine_fifo_nve0.c        Sat Feb 28 05:38:49 2015 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: nouveau_engine_fifo_nve0.c,v 1.3 2015/02/28 03:33:22 riastradh Exp $   */
+/*     $NetBSD: nouveau_engine_fifo_nve0.c,v 1.4 2015/02/28 05:38:49 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.3 2015/02/28 03:33:22 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: nouveau_engine_fifo_nve0.c,v 1.4 2015/02/28 05:38:49 riastradh Exp $");
 
 #include <core/client.h>
 #include <core/handle.h>
@@ -140,7 +140,7 @@
        int ret;
 
        spin_lock(&engn->lock);
-       DRM_SPIN_TIMED_WAIT_UNTIL(ret, &engn->wait, &engn->lock,
+       DRM_SPIN_TIMED_WAIT_NOINTR_UNTIL(ret, &engn->wait, &engn->lock,
            msecs_to_jiffies(2000),
            !(nv_rd32(priv, 0x002284 +
                    (engine * 0x08)) & 0x00100000));