From bd1d34ddce61bc9ff436dc3383538a5ba6269b74 Mon Sep 17 00:00:00 2001 From: snj Date: Sun, 21 Sep 2014 18:11:37 +0000 Subject: [PATCH] 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. --- sys/external/bsd/drm2/dist/drm/i915/i915_irq.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c index 50e1a802100d..b68611cac122 100644 --- a/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c +++ b/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c @@ -2250,7 +2250,9 @@ static void i915_error_work_func(struct work_struct *work) * 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); } }