aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorImre Deak <imre.deak@intel.com>2014-11-20 10:59:22 -0500
committerDaniel Vetter <daniel.vetter@ffwll.ch>2014-11-20 11:00:59 -0500
commit99990f1b0b95b3c6056d7d80669ab9a8644fed34 (patch)
tree3e748f138637f49fd4a457becff4594a2543d0ac
parentcc1df8a3fe39357fa5b727780129f50a68bff8f9 (diff)
drm/i915: remove the IRQs enabled WARN from intel_disable_gt_powersave
This function can be called now with i915 interrupts enabled, so the corresponding WARN is incorrect, remove it. I think this was spotted by Paulo during his review, but since I already removed the same WARN from intel_suspend_gt_powersave() I missed then his point. Spotted-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
-rw-r--r--drivers/gpu/drm/i915/intel_pm.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c
index 14f34f0358c0..9af0af49382e 100644
--- a/drivers/gpu/drm/i915/intel_pm.c
+++ b/drivers/gpu/drm/i915/intel_pm.c
@@ -6223,9 +6223,6 @@ void intel_disable_gt_powersave(struct drm_device *dev)
6223{ 6223{
6224 struct drm_i915_private *dev_priv = dev->dev_private; 6224 struct drm_i915_private *dev_priv = dev->dev_private;
6225 6225
6226 /* Interrupts should be disabled already to avoid re-arming. */
6227 WARN_ON(intel_irqs_enabled(dev_priv));
6228
6229 if (IS_IRONLAKE_M(dev)) { 6226 if (IS_IRONLAKE_M(dev)) {
6230 ironlake_disable_drps(dev); 6227 ironlake_disable_drps(dev);
6231 ironlake_disable_rc6(dev); 6228 ironlake_disable_rc6(dev);