Commit 1ef28d86 authored by Imre Deak's avatar Imre Deak
Browse files

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: default avatarJouni Högander <jouni.hogander@intel.com>
Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
parent f4ed123a

drivers/gpu/drm/i915/i915_driver.c

+1 −2
Original line number Diff line number Diff line
@@ -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);
@@ -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);