Try to unify the suspend paths and behaviour by moving the intel_opregion_suspend() calls to intel_display_driver_pm_suspend_late().
This is a change in the suspend sequences. The idea behind adding this to intel_display_driver_pm_suspend_late() is primarily based on not having to pass the s2idle parameter to more functions than that. This also changes behaviour for i915 hibernation, going for PCI_D3cold instead of PCI_D1 on hibernate. It's probably the correct thing to do anyway, I don't think it should matter all that much, but fingers crossed. Signed-off-by: Jani Nikula <[email protected]> --- drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++ drivers/gpu/drm/i915/i915_driver.c | 4 ---- drivers/gpu/drm/xe/display/xe_display.c | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c index 6cac36157bea..1525ff7a1dc2 100644 --- a/drivers/gpu/drm/i915/display/intel_display_driver.c +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c @@ -770,6 +770,8 @@ void intel_display_driver_pm_suspend_late(struct intel_display *display, bool s2 if (!HAS_DISPLAY(display)) return; + intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); + intel_display_power_suspend_late(display, s2idle); } diff --git a/drivers/gpu/drm/i915/i915_driver.c b/drivers/gpu/drm/i915/i915_driver.c index 40fc15017486..7d0f98cbf5d9 100644 --- a/drivers/gpu/drm/i915/i915_driver.c +++ b/drivers/gpu/drm/i915/i915_driver.c @@ -1096,7 +1096,6 @@ static int i915_drm_suspend(struct drm_device *dev) { struct drm_i915_private *dev_priv = to_i915(dev); struct intel_display *display = dev_priv->display; - pci_power_t opregion_target_state; disable_rpm_wakeref_asserts(&dev_priv->runtime_pm); @@ -1110,9 +1109,6 @@ static int i915_drm_suspend(struct drm_device *dev) i9xx_display_sr_save(display); - opregion_target_state = suspend_to_idle(dev_priv) ? PCI_D1 : PCI_D3cold; - intel_opregion_suspend(display, opregion_target_state); - dev_priv->suspend_count++; enable_rpm_wakeref_asserts(&dev_priv->runtime_pm); diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 9416405667d8..73891b36341b 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -266,14 +266,11 @@ static bool suspend_to_idle(void) void xe_display_pm_suspend(struct xe_device *xe) { struct intel_display *display = xe->display; - bool s2idle = suspend_to_idle(); if (!xe->info.probe_display) return; intel_display_driver_pm_suspend(display); - - intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); } void xe_display_pm_suspend_late(struct xe_device *xe) -- 2.47.3
