[PATCH] Revert "drm/i915: use runtime irq suspend/resume in freeze/thaw"

[Klaus Ethgen]

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


--LQksG6bCIzRHxTLp--

--BwCQnh7xodEAoBMC
Content-Type: application/pgp-signature; name="signature.asc"
Content-Description: Digital signature

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iQGcBAEBCgAGBQJU4vvqAAoJEKZ8CrGAGfasn3EMAJPepl2TdvEqFbSOYchfAiMK
RM/UxX9kfo1oPKjjwq3jMEnHRGjyhpFxsScn8JgbQBLdFb4I+22N9C+cfXbwViK0
UnthozNHEAyC/0+3hrPU34SeXglJs6pFst9nHF+0KXDsTq/LUcLc7XOH33j9KAUq
qZonDFJ8f0E+zPdOHCcCf8UpBXsIEfRuKRnaReqsrWhwbZVtk9D+s0/mjP8Pznku
mvqJsLG28CkS9maBMoXeRviXFiN6PUd9viWsTfrFZTWoCjBbIZ1EzvsiubjJwKz8
QzYoG28+9hVj8hsLC92DmPTa3epNA8/KvAkt2xY9ouIj4DSVbiGDnJIgXXHlhlR7
NReXeN8F3Qy7XFX3d+/mpKhSLViqeoU27+XqQQkurisYu9C8UqABmILm16UmuNWH
QoaXvhTtd30+YT7xRM9Edl47USudpQ9YhSnRD4xrKpyQ8krvc0F+B4RD9apDhdhA
NVoEybWTRyLrP+7axr1tZmMRi0t8hI2NSOHsZNjYqQ==
=/7bD
-----END PGP SIGNATURE-----

--BwCQnh7xodEAoBMC--
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/