Skip to content

Commit

Permalink
drm/i915: don't warn if IRQs are disabled when shutting down display …
Browse files Browse the repository at this point in the history
…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 <jbarnes@virtuousgeek.org>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Jesse Barnes authored and Daniel Vetter committed Jul 23, 2014
1 parent d49bdb0 commit 9a76e49
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/i915_irq.c
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down

0 comments on commit 9a76e49

Please sign in to comment.