Wed Jan 22 14:58:12 2014 UTC ()

Take irq_lock before waking up irq_queue in i915_handle_error.


(riastradh)

diff -r1.1.1.1.2.8 -r1.1.1.1.2.9 src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c

--- src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c 2014/01/15 13:53:32	1.1.1.1.2.8
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_irq.c 2014/01/22 14:58:12	1.1.1.1.2.9

 @@ -1487,28 +1487,33 @@ void i915_handle_error(struct drm_device
 	i915_capture_error_state(dev);
 	i915_report_and_clear_eir(dev);
 	if (wedged) {
 		INIT_COMPLETION(dev_priv->error_completion);
 		atomic_set(&dev_priv->mm.wedged, 1);
 		/*
 		 * Wakeup waiting processes so they don't hang
 		 */
 		for_each_ring(ring, dev_priv, i)
 #ifdef __NetBSD__
+		    {
 			unsigned long flags;
 			spin_lock_irqsave(&dev_priv->irq_lock, flags);
 			DRM_SPIN_WAKEUP_ALL(&ring->irq_queue,
 			    &dev_priv->irq_lock);
 			spin_unlock_irqrestore(&dev_priv->irq_lock, flags);
+		    }
 #else
 			wake_up_all(&ring->irq_queue);
 #endif
+	}
 	queue_work(dev_priv->wq, &dev_priv->error_work);
+}
 static void i915_pageflip_stall_check(struct drm_device *dev, int pipe)
+{
 	drm_i915_private_t *dev_priv = dev->dev_private;
 	struct drm_crtc *crtc = dev_priv->pipe_to_crtc_mapping[pipe];
 	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);