[PATCH 5/5] disable-irq-wedge

[Chris Wilson]

---
 drivers/gpu/drm/i915/i915_gem.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c
index 1b6ed9159a3f..c89cf172b2a7 100644
--- a/drivers/gpu/drm/i915/i915_gem.c
+++ b/drivers/gpu/drm/i915/i915_gem.c
@@ -3217,6 +3217,7 @@ void i915_gem_set_wedged(struct drm_i915_private *i915)
 	 * rolling the global seqno forward (since this would complete requests
 	 * for which we haven't set the fence error to EIO yet).
 	 */
+	disable_irq(i915->drm.irq);
 	for_each_engine(engine, i915, id) {
 		i915_gem_reset_prepare_engine(engine);
 
@@ -3265,6 +3266,7 @@ void i915_gem_set_wedged(struct drm_i915_private *i915)
 
 		i915_gem_reset_finish_engine(engine);
 	}
+	enable_irq(i915->drm.irq);
 
 	wake_up_all(&i915->gpu_error.reset_queue);
 }
-- 
2.16.2