diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2014-06-18 09:52:55 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2014-06-19 18:05:12 +0200 |
| commit | e11aa362308f5de467ce355a2a2471321b15a35c (patch) | |
| tree | ba6ddeb7b3381dfb337a457dfa8f8ddf41c9a9ef /drivers/gpu/drm/i915/intel_pm.c | |
| parent | e991077ec67e08bd345fcee4f810e59740359da5 (diff) | |
| download | op-kernel-dev-e11aa362308f5de467ce355a2a2471321b15a35c.zip op-kernel-dev-e11aa362308f5de467ce355a2a2471321b15a35c.tar.gz | |
drm/i915: use runtime irq suspend/resume in freeze/thaw
We don't need to uninstall the full handler, simply disabling interrupts
ought to be enough.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_pm.c')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_pm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 8148d06..1cce0a5 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4880,7 +4880,7 @@ void intel_suspend_gt_powersave(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; /* Interrupts should be disabled already to avoid re-arming. */ - WARN_ON(dev->irq_enabled); + WARN_ON(dev->irq_enabled && !dev_priv->pm.irqs_disabled); flush_delayed_work(&dev_priv->rps.delayed_resume_work); @@ -4892,7 +4892,7 @@ void intel_disable_gt_powersave(struct drm_device *dev) struct drm_i915_private *dev_priv = dev->dev_private; /* Interrupts should be disabled already to avoid re-arming. */ - WARN_ON(dev->irq_enabled); + WARN_ON(dev->irq_enabled && !dev_priv->pm.irqs_disabled); if (IS_IRONLAKE_M(dev)) { ironlake_disable_drps(dev); |
