>From b9831d771ea7f416f3ab1c992f67c7523f34ecbd Mon Sep 17 00:00:00 2001 From: Klaus Ethgen Date: Mon, 16 Feb 2015 23:20:41 +0100 Subject: [PATCH] Revert "drm/i915: use runtime irq suspend/resume in freeze/thaw" It is a wrong assumption that disabling the interrupts is enough. This reverts commit e11aa362308f5de467ce355a2a2471321b15a35c. --- drivers/gpu/drm/i915/i915_drv.c | 5 +++-- drivers/gpu/drm/i915/intel_pm.c | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9256973..bc390da 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -575,7 +575,7 @@ static int i915_drm_freeze(struct drm_device *dev) flush_delayed_work(&dev_priv->rps.delayed_resume_work); - intel_runtime_pm_disable_interrupts(dev); + drm_irq_uninstall(dev); intel_hpd_cancel_work(dev_priv); intel_suspend_encoders(dev_priv); @@ -680,7 +680,8 @@ static int __i915_drm_thaw(struct drm_device *dev, bool restore_gtt_mappings) } mutex_unlock(&dev->struct_mutex); - intel_runtime_pm_restore_interrupts(dev); + /* We need working interrupts for modeset enabling ... */ + drm_irq_install(dev, dev->pdev->irq); intel_modeset_init_hw(dev); diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index 83c7ecf..ee68ba9 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -5195,7 +5195,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(intel_irqs_enabled(dev_priv)); + WARN_ON(dev->irq_enabled); flush_delayed_work(&dev_priv->rps.delayed_resume_work); @@ -5210,7 +5210,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(intel_irqs_enabled(dev_priv)); + WARN_ON(dev->irq_enabled); if (IS_IRONLAKE_M(dev)) { ironlake_disable_drps(dev); -- 2.1.4