[PATCH] drm/i915: Restore interrupt enabling after a reset

Chris Wilson chris at chris-wilson.co.uk
Sat Feb 16 11:13:41 UTC 2019


At least on i965g and i965gm, performing a device reset clobbers the IER
resulting in loss of interrupts thereafter. So, run the irq_postinstall
hook to restore them.

Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>
Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
---
 drivers/gpu/drm/i915/i915_reset.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c
index 5a067a4b3d5d..58cbfdc8df1b 100644
--- a/drivers/gpu/drm/i915/i915_reset.c
+++ b/drivers/gpu/drm/i915/i915_reset.c
@@ -994,10 +994,12 @@ void i915_reset(struct drm_i915_private *i915,
 		goto error;
 	}
 
+	i915->drm.driver->irq_uninstall(&i915->drm);
 	if (do_reset(i915, stalled_mask)) {
 		dev_err(i915->drm.dev, "Failed to reset chip\n");
 		goto taint;
 	}
+	i915->drm.driver->irq_postinstall(&i915->drm);
 
 	intel_overlay_reset(i915);
 
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list