Module Name: src
Committed By: snj
Date: Sun Sep 21 18:11:38 UTC 2014
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915 [netbsd-7]: i915_irq.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #99):
sys/external/bsd/drm2/dist/drm/i915/i915_irq.c: revision 1.9
Lock irq_lock around i915_error_wake_up in i915_error_work_func.
To generate a diff of this commit:
cvs rdiff -u -r1.6.2.1 -r1.6.2.2 \
src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.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_irq.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.6.2.1 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.6.2.2
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c:1.6.2.1 Sun Sep 21 18:10:52 2014
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c Sun Sep 21 18:11:37 2014
@@ -2250,7 +2250,9 @@ static void i915_error_work_func(struct
* Note: The wake_up also serves as a memory barrier so that
* waiters see the update value of the reset counter atomic_t.
*/
+ spin_lock(&dev_priv->irq_lock);
i915_error_wake_up(dev_priv, true);
+ spin_unlock(&dev_priv->irq_lock);
}
}
