index 654d42f..b7e1a04 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -244,7 +244,7 @@ irqreturn_t i915_driver_irq_handler(DRM_IRQ_ARGS)
                 * stray interrupts.
                 */
                iir = new_iir;
-       } while (iir != 0);
+       } while (iir != 0 && dev->pdev->msi_enabled);
 
        return IRQ_HANDLED;
 }