[PATCH 2/2] drm/i915: Move display HW state readout to early resume phase 2
Imre Deak
imre.deak at intel.com
Sat Sep 15 14:15:59 UTC 2018
Signed-off-by: Imre Deak <imre.deak at intel.com>
---
drivers/gpu/drm/i915/i915_drv.c | 34 ++++++++++++++++++----------------
1 file changed, 18 insertions(+), 16 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
index 643473d8d1d6..e14b3fc50491 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);
@@ -2025,20 +2025,11 @@ static int i915_suspend_switcheroo(struct drm_device *dev, pm_message_t state)
static int i915_drm_resume(struct drm_device *dev)
{
struct drm_i915_private *dev_priv = to_i915(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");
-
- intel_csr_ucode_resume(dev_priv);
i915_restore_state(dev_priv);
+
intel_pps_unlock_regs_wa(dev_priv);
intel_opregion_setup(dev_priv);
@@ -2071,6 +2062,7 @@ static int i915_drm_resume(struct drm_device *dev)
intel_dp_mst_resume(dev_priv);
intel_display_readout_hw_state(dev_priv);
+
intel_display_resume(dev);
drm_kms_helper_poll_enable(dev);
@@ -2169,6 +2161,16 @@ 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);
+
+ ret = i915_ggtt_enable_hw(dev_priv);
+ if (ret)
+ DRM_ERROR("failed to re-enable GGTT\n");
+
+ intel_csr_ucode_resume(dev_priv);
+
enable_rpm_wakeref_asserts(dev_priv);
return ret;
--
2.13.2
More information about the Intel-gfx-trybot
mailing list