[PATCH 2/2] drm/i915: Move display HW state readout to early resume phase 4
Imre Deak
imre.deak at intel.com
Sat Sep 15 21:42:19 UTC 2018
Signed-off-by: Imre Deak <imre.deak at intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 643473d8d1d6..80809db77df5 100644
--- a/drivers/gpu/drm/i915/i915_drv.c
+++ b/drivers/gpu/drm/i915/i915_drv.c
@@ -1923,12 +1923,6 @@ static int i915_drm_suspend(struct drm_device *dev)
intel_opregion_unregister(dev_priv);
- intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
-
- dev_priv->suspend_count++;
-
- intel_csr_ucode_suspend(dev_priv);
-
enable_rpm_wakeref_asserts(dev_priv);
return 0;
@@ -1954,6 +1948,12 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
disable_rpm_wakeref_asserts(dev_priv);
+ intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
+
+ dev_priv->suspend_count++;
+
+ intel_csr_ucode_suspend(dev_priv);
+
i915_gem_suspend_late(dev_priv);
intel_uncore_suspend(dev_priv);
@@ -2028,10 +2028,6 @@ static int i915_drm_resume(struct drm_device *dev)
int ret;
disable_rpm_wakeref_asserts(dev_priv);
- intel_sanitize_gt_powersave(dev_priv);
-
- i915_gem_sanitize(dev_priv);
-
ret = i915_ggtt_enable_hw(dev_priv);
if (ret)
DRM_ERROR("failed to re-enable GGTT\n");
@@ -2169,6 +2165,10 @@ static int i915_drm_resume_early(struct drm_device *dev)
intel_engines_sanitize(dev_priv);
+ intel_sanitize_gt_powersave(dev_priv);
+
+ i915_gem_sanitize(dev_priv);
+
enable_rpm_wakeref_asserts(dev_priv);
return ret;
--
2.13.2
More information about the Intel-gfx-trybot
mailing list