Attachment 133376 Details for Bug 95149 – Patch to fix DC mismatch during hibernation/resume

[patch] Patch to fix DC mismatch during hibernation/resume

0001-drm-i915-gen9-Set-same-power-state-before-hibernatio.patch (text/plain), 2.49 KB, created by Imre Deak on 2017-08-08 10:49:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Imre Deak

Created: 2017-08-08 10:49:43 UTC

Size: 2.49 KB

patch

obsolete

>From d169db0497020a5e1447da8077c7715c406eceb3 Mon Sep 17 00:00:00 2001
>From: Imre Deak <imre.deak@intel.com>
>Date: Wed, 12 Jul 2017 16:44:38 +0300
>Subject: [PATCH] drm/i915/gen9+: Set same power state before hibernation image
> save/restore
>
>Atm, on GEN9 big core platforms before saving the hibernation image we
>uninitialize the display, disabling power wells manually, while before
>restoring the image we keep things powered (letting HW/DMC power down
>things as needed). The state mismatch will trigger the following error:
>
>DC state mismatch (0x0 -> 0x2)
>
>While the restore handler knows how to initialize the display from an
>unknown state (due to a different loader kernel or not having i915
>loaded in the loader kernel) we should still use the same state for
>consistency before image saving and restoring. Do this by uniniting the
>display before restoring the image too.
>
>Signed-off-by: Imre Deak <imre.deak@intel.com>
>---
> drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++-------
> 1 file changed, 13 insertions(+), 7 deletions(-)
>
>diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
>index ba15844cbafc..5aa5705e1fe4 100644
>--- a/drivers/gpu/drm/i915/i915_drv.c
>+++ b/drivers/gpu/drm/i915/i915_drv.c
>@@ -1570,7 +1570,7 @@ static int i915_drm_suspend_late(struct drm_device *dev, bool hibernation)
> 
> 	intel_display_set_init_power(dev_priv, false);
> 
>-	fw_csr = !IS_GEN9_LP(dev_priv) &&
>+	fw_csr = !IS_GEN9_LP(dev_priv) && !hibernation &&
> 		suspend_to_idle(dev_priv) && dev_priv->csr.dmc_payload;
> 	/*
> 	 * In case of firmware assisted context save/restore don't manually
>@@ -2054,11 +2054,14 @@ static int i915_pm_resume(struct device *kdev)
> /* freeze: before creating the hibernation_image */
> static int i915_pm_freeze(struct device *kdev)
> {
>+	struct drm_device *dev = &kdev_to_i915(kdev)->drm;
> 	int ret;
> 
>-	ret = i915_pm_suspend(kdev);
>-	if (ret)
>-		return ret;
>+	if (dev->switch_power_state != DRM_SWITCH_POWER_OFF) {
>+		ret = i915_drm_suspend(dev);
>+		if (ret)
>+			return ret;
>+	}
> 
> 	ret = i915_gem_freeze(kdev_to_i915(kdev));
> 	if (ret)
>@@ -2069,11 +2072,14 @@ static int i915_pm_freeze(struct device *kdev)
> 
> static int i915_pm_freeze_late(struct device *kdev)
> {
>+	struct drm_device *dev = &kdev_to_i915(kdev)->drm;
> 	int ret;
> 
>-	ret = i915_pm_suspend_late(kdev);
>-	if (ret)
>-		return ret;
>+	if (dev->switch_power_state != DRM_SWITCH_POWER_OFF) {
>+		ret = i915_drm_suspend_late(dev, true);
>+		if (ret)
>+			return ret;
>+	}
> 
> 	ret = i915_gem_freeze_late(kdev_to_i915(kdev));
> 	if (ret)
>-- 
>2.13.2
>

Actions: View | Splinter Review

Attachments on bug 95149: 123276 | 123279 | 123285 | 123626 | 123835 | 123838 | 127541 | 128002 | 131454 | 131455 | 133376

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.