Skip to content

Commit

Permalink
drm/i915: Suspend the framebuffer console earlier during system suspend
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Imre Deak committed Jan 8, 2024
1 parent f4ed123 commit 1ef28d8
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions drivers/gpu/drm/i915/i915_driver.c
Original file line number Diff line number Diff line change
Expand Up @@ -1080,6 +1080,7 @@ static int i915_drm_suspend(struct drm_device *dev)
/* We do a lot of poking in a lot of registers, make sure they work
* properly. */
intel_power_domains_disable(dev_priv);
intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);
if (HAS_DISPLAY(dev_priv))
drm_kms_helper_poll_disable(dev);

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

intel_fbdev_set_suspend(dev, FBINFO_STATE_SUSPENDED, true);

dev_priv->suspend_count++;

intel_dmc_suspend(dev_priv);
Expand Down

0 comments on commit 1ef28d8

Please sign in to comment.