1 files changed, 12 insertions, 2 deletions

diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 33faad3197fe..6a8f27d0a742 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -387,8 +387,18 @@ static void intel_ring_setup_status_page(struct intel_engine_cs *engine)
                 mmio = RING_HWS_PGA(engine->mmio_base);
         }
 
-        if (INTEL_GEN(dev_priv) >= 6)
-                I915_WRITE(RING_HWSTAM(engine->mmio_base), 0xffffffff);
+        if (INTEL_GEN(dev_priv) >= 6) {
+                u32 mask = ~0u;
+
+                /*
+                 * Keep the render interrupt unmasked as this papers over
+                 * lost interrupts following a reset.
+                 */
+                if (engine->id == RCS)
+                        mask &= ~BIT(0);
+
+                I915_WRITE(RING_HWSTAM(engine->mmio_base), mask);
+        }
 
         I915_WRITE(mmio, engine->status_page.ggtt_offset);
         POSTING_READ(mmio);