Commit e11aa362 authored by Jesse Barnes's avatar Jesse Barnes Committed by Daniel Vetter

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: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarImre Deak <imre.deak@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e991077e
...@@ -522,7 +522,7 @@ static int i915_drm_freeze(struct drm_device *dev) ...@@ -522,7 +522,7 @@ static int i915_drm_freeze(struct drm_device *dev)
return error; return error;
} }
drm_irq_uninstall(dev); intel_runtime_pm_disable_interrupts(dev);
dev_priv->enable_hotplug_processing = false; dev_priv->enable_hotplug_processing = false;
intel_suspend_gt_powersave(dev); intel_suspend_gt_powersave(dev);
...@@ -646,8 +646,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) ...@@ -646,8 +646,7 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings)
} }
mutex_unlock(&dev->struct_mutex); mutex_unlock(&dev->struct_mutex);
/* We need working interrupts for modeset enabling ... */ intel_runtime_pm_restore_interrupts(dev);
drm_irq_install(dev, dev->pdev->irq);
intel_modeset_init_hw(dev); intel_modeset_init_hw(dev);
......
...@@ -4880,7 +4880,7 @@ void intel_suspend_gt_powersave(struct drm_device *dev) ...@@ -4880,7 +4880,7 @@ void intel_suspend_gt_powersave(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
/* Interrupts should be disabled already to avoid re-arming. */ /* 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); flush_delayed_work(&dev_priv->rps.delayed_resume_work);
...@@ -4892,7 +4892,7 @@ void intel_disable_gt_powersave(struct drm_device *dev) ...@@ -4892,7 +4892,7 @@ void intel_disable_gt_powersave(struct drm_device *dev)
struct drm_i915_private *dev_priv = dev->dev_private; struct drm_i915_private *dev_priv = dev->dev_private;
/* Interrupts should be disabled already to avoid re-arming. */ /* 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)) { if (IS_IRONLAKE_M(dev)) {
ironlake_disable_drps(dev); ironlake_disable_drps(dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment