drm/i915: don't warn if IRQs are disabled when shutting down display IRQs
authorJesse Barnes <jbarnes@virtuousgeek.org>
Fri, 20 Jun 2014 16:29:19 +0000 (09:29 -0700)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 23 Jul 2014 05:05:33 +0000 (07:05 +0200)
This was always the case on our suspend path, but it was recently
exposed by the change to use our runtime IRQ disable routine rather than
the full DRM IRQ disable.  Keep the warning on the enable side, as that
really would indicate a bug.

Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/i915_irq.c

index e2e9bb8f4fe70d04f5768ed34be68d800a2fdc93..3ae33e7e9d0965e11c862b1a60767f2c0dc7e3f1 100644 (file)
@@ -151,7 +151,7 @@ ironlake_disable_display_irq(struct drm_i915_private *dev_priv, u32 mask)
 {
        assert_spin_locked(&dev_priv->irq_lock);
 
-       if (WARN_ON(dev_priv->pm.irqs_disabled))
+       if (dev_priv->pm.irqs_disabled)
                return;
 
        if ((dev_priv->irq_mask & mask) != mask) {