From: Jesse Barnes Date: Fri, 20 Jun 2014 16:29:19 +0000 (-0700) Subject: drm/i915: don't warn if IRQs are disabled when shutting down display IRQs X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9a76e4956b719ec32acdd37c80944423e4825bbf;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git drm/i915: don't warn if IRQs are disabled when shutting down display IRQs 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 Reviewed-by: Paulo Zanoni Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e2e9bb8f4fe7..3ae33e7e9d09 100644 --- a/drivers/gpu/drm/i915/i915_irq.c +++ b/drivers/gpu/drm/i915/i915_irq.c @@ -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) {