[src/riastradh-drm2]: src/sys/external/bsd/drm2/dist/drm/i915 Don't mess with...

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

details:   https://anonhg.NetBSD.org/src/rev/f045ceb9204d
branches:  riastradh-drm2
changeset: 788347:f045ceb9204d
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Wed Jul 24 03:21:56 2013 +0000

description:
Don't mess with guts of struct completion in i915_gem.c.

diffstat:

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

diffs (28 lines):

diff -r 5d543533251d -r f045ceb9204d sys/external/bsd/drm2/dist/drm/i915/i915_gem.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Wed Jul 24 03:21:40 2013 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_gem.c    Wed Jul 24 03:21:56 2013 +0000
@@ -92,7 +92,9 @@
 {
        struct drm_i915_private *dev_priv = dev->dev_private;
        struct completion *x = &dev_priv->error_completion;
+#ifndef __NetBSD__
        unsigned long flags;
+#endif
        int ret;
 
        if (!atomic_read(&dev_priv->mm.wedged))
@@ -117,9 +119,14 @@
                 * end up waiting upon a subsequent completion event that
                 * will never happen.
                 */
+#ifdef __NetBSD__
+               /* XXX Hope it's not a problem that we might wake someone.  */
+               complete(x);
+#else
                spin_lock_irqsave(&x->wait.lock, flags);
                x->done++;
                spin_unlock_irqrestore(&x->wait.lock, flags);
+#endif
        }
        return 0;
 }