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

Chris Wilson chris at chris-wilson.co.uk
Sun Feb 17 21:25:35 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 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/i915/i915_reset.c b/drivers/gpu/drm/i915/i915_reset.c
index 5a067a4b3d5d..f3b756d2b61b 100644
--- a/drivers/gpu/drm/i915/i915_reset.c
+++ b/drivers/gpu/drm/i915/i915_reset.c
@@ -685,6 +685,9 @@ static int gt_reset(struct drm_i915_private *i915, unsigned int stalled_mask)
 	if (err)
 		return err;
 
+	if (INTEL_INFO(i915)->gpu_reset_clobbers_display)
+		i915->drm.driver->irq_postinstall(&i915->drm);
+
 	for_each_engine(engine, i915, id)
 		intel_engine_reset(engine, stalled_mask & ENGINE_MASK(id));
 
-- 
2.20.1



More information about the Intel-gfx-trybot mailing list