drm/i915: make runtime PM interrupt enable/disable platform independent
We need to disable the interrupts for all platforms, so make the helpers
for this platform independent and call them from them platform
independent runtime suspend/resume callbacks.
On HSW/BDW this will move interrupt disabling/re-enabling at the
beginning/end of runtime suspend/resume respectively, but I don't see
any reason why this would cause a problem there. In any case this seems
to be the correct thing to do even on those platforms.
Signed-off-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 2d4fc91..ff02b0c 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -916,13 +916,6 @@
return i915_drm_freeze(drm_dev);
}
-static void snb_runtime_suspend(struct drm_i915_private *dev_priv)
-{
- struct drm_device *dev = dev_priv->dev;
-
- intel_runtime_pm_disable_interrupts(dev);
-}
-
static void hsw_runtime_suspend(struct drm_i915_private *dev_priv)
{
hsw_enable_pc8(dev_priv);
@@ -932,7 +925,6 @@
{
struct drm_device *dev = dev_priv->dev;
- intel_runtime_pm_restore_interrupts(dev);
intel_init_pch_refclk(dev);
i915_gem_init_swizzling(dev);
mutex_lock(&dev_priv->rps.hw_lock);
@@ -959,8 +951,10 @@
DRM_DEBUG_KMS("Suspending device\n");
+ intel_runtime_pm_disable_interrupts(dev);
+
if (IS_GEN6(dev))
- snb_runtime_suspend(dev_priv);
+ ;
else if (IS_HASWELL(dev) || IS_BROADWELL(dev))
hsw_runtime_suspend(dev_priv);
else
@@ -1004,6 +998,8 @@
else
WARN_ON(1);
+ intel_runtime_pm_restore_interrupts(dev);
+
DRM_DEBUG_KMS("Device resumed\n");
return 0;
}