diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-06-20 09:29:19 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-07-23 07:05:33 +0200 |
| commit | 9a76e4956b719ec32acdd37c80944423e4825bbf (patch) | |
| tree | 88becd2ed1dc8b153ebe95a3fc3f21e01e3a5bc5 /drivers/gpu/drm/i915 | |
| parent | d49bdb0e1054d022cc6f88fcecf9c79bae66eab0 (diff) | |
| download | op-kernel-dev-9a76e4956b719ec32acdd37c80944423e4825bbf.zip op-kernel-dev-9a76e4956b719ec32acdd37c80944423e4825bbf.tar.gz | |
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 <jbarnes@virtuousgeek.org>
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_irq.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c index e2e9bb8f..3ae33e7 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) { |
