Merge tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Small conflict as I had the balance in my tree already for testing.

* tag 'drm-intel-fixes-2016-03-03' of git://anongit.freedesktop.org/drm-intel:
  drm/i915: Balance assert_rpm_wakelock_held() for !IS_ENABLED(CONFIG_PM)
  drm/i915/skl: Fix power domain suspend sequence

1 files changed, 3 insertions, 3 deletions

diff --git a/drivers/gpu/drm/i915/intel_runtime_pm.c b/drivers/gpu/drm/i915/intel_runtime_pm.c
index 92f8d96ef9c5..4f43d9b32e66 100644
--- a/drivers/gpu/drm/i915/intel_runtime_pm.c
+++ b/drivers/gpu/drm/i915/intel_runtime_pm.c
@@ -2303,15 +2303,15 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)
  */
 void intel_power_domains_suspend(struct drm_i915_private *dev_priv)
 {
-        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
-                skl_display_core_uninit(dev_priv);
-
         /*
          * Even if power well support was disabled we still want to disable
          * power wells while we are system suspended.
          */
         if (!i915.disable_power_well)
                 intel_display_power_put(dev_priv, POWER_DOMAIN_INIT);
+
+        if (IS_SKYLAKE(dev_priv) || IS_KABYLAKE(dev_priv))
+                skl_display_core_uninit(dev_priv);
 }
 
 /**