drm/i915: Call uncore_suspend before platform suspend handlers

Quoting Ville: "the forcewake timer might still be active until the uncore
suspend, and having active forcewakes while we've already told the GT wake
stuff to stop acting normally doesn't seem quite right to me."

Reported-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Suggested-by: Imre Deak <imre.deak@intel.com>
Reviewed-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171114135518.15981-3-hdegoede@redhat.com

diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index f4588add15db25bea6ab6a6f361a3ce291f6f3ff..3423d873123a7a2f06c37c71ec5910e4a7df818b 100644 (file)
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -2526,6 +2526,8 @@ static int intel_runtime_suspend(struct device *kdev)
 
        intel_runtime_pm_disable_interrupts(dev_priv);
 
+       intel_uncore_suspend(dev_priv);
+
        ret = 0;
        if (IS_GEN9_LP(dev_priv)) {
                bxt_display_core_uninit(dev_priv);
@@ -2538,6 +2540,8 @@ static int intel_runtime_suspend(struct device *kdev)
 
        if (ret) {
                DRM_ERROR("Runtime suspend failed, disabling it (%d)\n", ret);
+               intel_uncore_runtime_resume(dev_priv);
+
                intel_runtime_pm_enable_interrupts(dev_priv);
 
                enable_rpm_wakeref_asserts(dev_priv);
@@ -2545,8 +2549,6 @@ static int intel_runtime_suspend(struct device *kdev)
                return ret;
        }
 
-       intel_uncore_suspend(dev_priv);
-
        enable_rpm_wakeref_asserts(dev_priv);
        WARN_ON_ONCE(atomic_read(&dev_priv->runtime_pm.wakeref_count));