Skip to content

Commit 1ef28d8

Browse files
committed
drm/i915: Suspend the framebuffer console earlier during system suspend
Suspend the FB console early during system suspend to prevent new FB probe/modeset cycles interfering with the HW uninitialization steps in a similar way as during driver shutdown as described in the previous patch. Link: https://patchwork.freedesktop.org/patch/msgid/20240104083008.2715733-7-imre.deak@intel.com Reviewed-by: Jouni Högander <jouni.hogander@intel.com> Signed-off-by: Imre Deak <imre.deak@intel.com>
1 parent f4ed123 commit 1ef28d8

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

drivers/gpu/drm/i915/i915_driver.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1080,6 +1080,7 @@ static int i915_drm_suspend(struct drm_device *dev)
10801080
/* We do a lot of poking in a lot of registers, make sure they work
10811081
* properly. */
10821082
intel_power_domains_disable(dev_priv);
1083+
intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
10831084
if (HAS_DISPLAY(dev_priv))
10841085
drm_kms_helper_poll_disable(dev);
10851086

@@ -1103,8 +1104,6 @@ static int i915_drm_suspend(struct drm_device *dev)
11031104
opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold;
11041105
intel_opregion_suspend(dev_priv, opregion_target_state);
11051106

1106-
intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
1107-
11081107
dev_priv->suspend_count++;
11091108

11101109
intel_dmc_suspend(dev_priv);

0 commit comments

Comments
 (0)