Commit 3a3d9cb0 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915/pm: Allow drivers/pci to manage our pci state normally 



Stop doing the pci_save_state(), except when we need to prevent
D3 due to BIOS bugs, so that the code in drivers/pci is allowed
to manage the state of the PCI device. Less chance something
getting left by the wayside by i915 if/when the things change in
drivers/pci.

Cc: Badal Nilawar <badal.nilawar@intel.com>
Reviewed-by: default avatarJouni Högander <jouni.hogander@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250919185015.14561-6-ville.syrjala@linux.intel.com
parent 03a37f5c

drivers/gpu/drm/i915/i915_driver.c

+5 −6
Original line number Diff line number Diff line
@@ -1162,9 +1162,8 @@ static int i915_drm_suspend_noirq(struct drm_device *dev, bool hibernation) 
	 * pci_save_state() prevents drivers/pci from

	 * automagically putting the device into D3.

	 */

	if (hibernation && GRAPHICS_VER(dev_priv) < 6)

		pci_save_state(pdev);

	if (!(hibernation && GRAPHICS_VER(dev_priv) < 6))

		pci_set_power_state(pdev, PCI_D3hot);



	return 0;

}
@@ -1172,6 +1171,7 @@ static int i915_drm_suspend_noirq(struct drm_device *dev, bool hibernation) 
int i915_driver_suspend_switcheroo(struct drm_i915_private *i915,

				   pm_message_t state)

{

	struct pci_dev *pdev = to_pci_dev(i915->drm.dev);

	int error;



	if (drm_WARN_ON_ONCE(&i915->drm, state.event != PM_EVENT_SUSPEND &&
@@ -1189,9 +1189,8 @@ int i915_driver_suspend_switcheroo(struct drm_i915_private *i915, 
	if (error)

		return error;



	error = i915_drm_suspend_noirq(&i915->drm, false);

	if (error)

		return error;

	pci_save_state(pdev);

	pci_set_power_state(pdev, PCI_D3hot);



	return 0;

}