drm/i915/gen9+: Set same power state before hibernation image save/restore
Subsystems (2)
PATCH 1/1 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.
Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=133376
---
[ No Fixes: line, since I'm not aware of any other issues caused by this
besides the error message. ]
--- drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)
drivers/gpu/drm/i915/i915_drv.c +13 -7
@@ -1571,7 +1571,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
@@ -2055,11 +2055,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)
@@ -2070,11 +2073,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)
Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 7 lines · Imre Deak
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)
Quoted 7 lines
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.
Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=133376
Correctly:
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=95149
thanks to Jani Saarinen for noticing it.
Quoted 72 lines
Reported-and-tested-by Wang Wendy <[email protected]>Reported-and-tested-by Joonas Lahtinen <[email protected]>Cc Wang Wendy <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Imre Deak <[email protected]>---
[ No Fixes: line, since I'm not aware of any other issues caused by this
besides the error message. ]--- drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_drv.c +13
-7@@ -1571,7 +1571,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 @@ -2055,11 +2055,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)@@ -2070,11 +2073,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)Signature · 6 lines
2.13.2 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915/gen9+: Set same power state before hibernation image save/restore
In reply to Imre Deak== Series Details ==
== Series Details ==
Series: drm/i915/gen9+: Set same power state before hibernation image save/restore
URL : https://patchwork.freedesktop.org/series/28873/
State : success
== Summary ==
Series 28873v1 drm/i915/gen9+: Set same power state before hibernation image save/restore
https://patchwork.freedesktop.org/api/1.0/series/28873/revisions/1/mbox/
Test kms_cursor_legacy:
Subgroup basic-busy-flip-before-cursor-atomic:
pass -> FAIL (fi-snb-2600) fdo#100215fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:453s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:434s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:363s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:559s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:522s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:538s fi-byt-n2820 total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:517s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:609s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:447s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:429s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:508s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:478s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:482s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:597s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:599s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:527s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:477s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:491s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:445s fi-skl-x1585l total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:481s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:542s fi-snb-2600 total:279 pass:249 dwarn:0 dfail:0 fail:1 skip:29 time:405s
ada53b43f81fe618f3f0f1dfbd3dd776bb277323 drm-tip: 2017y-08m-16d-15h-18m-56s UTC integration manifest 58aa054f582c drm/i915/gen9+: Set same power state before hibernation image save/restore
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5416/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 48 lines · Imre Deak
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.
Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=133376
Reported-and-tested-by Wang Wendy <[email protected]>Reported-and-tested-by Joonas Lahtinen <[email protected]>Cc Wang Wendy <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Imre Deak <[email protected]>---
[ No Fixes: line, since I'm not aware of any other issues caused by this
besides the error message. ]--- drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-1@@ -1571,7 +1571,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 @@ -2055,11 +2055,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;
drivers/gpu/drm/i915/i915_drv.c static int i915_pm_resume(struct device *kdev) · line 2065
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c +5
-3int 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; + }
Hmm. This hunk is here just for consistentency I take it?
Patch lgtm
Quoted 23 lines
drivers/gpu/drm/i915/i915_drv.c +6
-3ret =i915_gem_freeze (kdev_to_i915 (kdev));if (ret)@@ -2070,11 +2073,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)Signature · 1 line
2.13.2
Signature · 6 lines
Ville Syrjälä Intel OTC _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 51 lines · Ville Syrjälä
Quoted 50 lines · Imre Deak
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.
Bugzilla: https://bugs.freedesktop.org/attachment.cgi?id=133376
Reported-and-tested-by Wang Wendy <[email protected]>Reported-and-tested-by Joonas Lahtinen <[email protected]>Cc Wang Wendy <[email protected]>Cc Joonas Lahtinen <[email protected]>Cc Rodrigo Vivi <[email protected]>Cc Ville Syrjala <[email protected]>Signed-off-by Imre Deak <[email protected]>---
[ No Fixes: line, since I'm not aware of any other issues caused by this
besides the error message. ]--- drivers/gpu/drm/i915/i915_drv.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-)drivers/gpu/drm/i915/i915_drv.c +2
-1@@ -1571,7 +1571,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 @@ -2055,11 +2055,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;
Quoted 10 lines
drivers/gpu/drm/i915/i915_drv.c static int i915_pm_resume(struct device *kdev) · line 2065
Quoted 8 lines
drivers/gpu/drm/i915/i915_drv.c +5
-3- 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; + }Hmm. This hunk is here just for consistentency I take it?
Yes, to make i915_pm_freeze() and i915_pm_freeze_late() similar.
Quoted 23 lines
Patch lgtm
Reviewed-by Ville Syrjälä <[email protected]>Quoted 19 lines
drivers/gpu/drm/i915/i915_drv.c +6
-3ret =i915_gem_freeze (kdev_to_i915 (kdev));if (ret)@@ -2070,11 +2073,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; + }
Quoted 8 lines
Quoted 4 lines
drivers/gpu/drm/i915/i915_drv.c +0
-0ret =i915_gem_freeze_late (kdev_to_i915 (kdev));if (ret)Signature · 1 line
2.13.2Signature · 2 lines
Ville Syrjälä Intel OTC
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: ✓ Fi.CI.BAT: success for drm/i915/gen9+: Set same power state before hibernation image save/restore
In reply to PatchworkQuoted 5 lines · Patchwork
== Series Details ==
Series: drm/i915/gen9+: Set same power state before hibernation image save/restore
URL : https://patchwork.freedesktop.org/series/28873/
State : success
Thanks for the review, pushed it to -dinq.
Quoted 37 lines
== Summary ==
Series 28873v1 drm/i915/gen9+: Set same power state before hibernation image save/restore
https://patchwork.freedesktop.org/api/1.0/series/28873/revisions/1/mbox/Test
kms_cursor_legacy:Subgroup basic-busy-flip-before-cursor-atomic: pass -> FAIL (fi-snb-2600) fdo#100215fdo#100215 https://bugs.freedesktop.org/show_bug.cgi?id=100215
fi-bdw-5557u total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:453s fi-bdw-gvtdvm total:279 pass:265 dwarn:0 dfail:0 fail:0 skip:14 time:434s fi-blb-e6850 total:279 pass:224 dwarn:1 dfail:0 fail:0 skip:54 time:363s fi-bsw-n3050 total:279 pass:243 dwarn:0 dfail:0 fail:0 skip:36 time:559s fi-bxt-j4205 total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:522s fi-byt-j1900 total:279 pass:254 dwarn:1 dfail:0 fail:0 skip:24 time:538s fi-byt-n2820 total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:517s fi-glk-2a total:279 pass:260 dwarn:0 dfail:0 fail:0 skip:19 time:609s fi-hsw-4770 total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:447s fi-hsw-4770r total:279 pass:263 dwarn:0 dfail:0 fail:0 skip:16 time:421s fi-ilk-650 total:279 pass:229 dwarn:0 dfail:0 fail:0 skip:50 time:429s fi-ivb-3520m total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:508s fi-ivb-3770 total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:478s fi-kbl-7500u total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:482s fi-kbl-7560u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:597s fi-kbl-r total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:599s fi-pnv-d510 total:279 pass:223 dwarn:1 dfail:0 fail:0 skip:55 time:527s fi-skl-6260u total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:477s fi-skl-6700k total:279 pass:261 dwarn:0 dfail:0 fail:0 skip:18 time:477s fi-skl-6770hq total:279 pass:269 dwarn:0 dfail:0 fail:0 skip:10 time:491s fi-skl-gvtdvm total:279 pass:266 dwarn:0 dfail:0 fail:0 skip:13 time:445s fi-skl-x1585l total:279 pass:268 dwarn:0 dfail:0 fail:0 skip:11 time:481s fi-snb-2520m total:279 pass:251 dwarn:0 dfail:0 fail:0 skip:28 time:542s fi-snb-2600 total:279 pass:249 dwarn:0 dfail:0 fail:1 skip:29 time:405s
Quoted 6 lines
ada53b43f81fe618f3f0f1dfbd3dd776bb277323drm-tip: 2017y-08m-16d-15h-18m-56s UTC integration manifest58aa054f582cdrm/i915/gen9+: Set same power state before hibernation image save/restore== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5416/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx