[PATCH v2] drm/{i915, xe}: add/move intel_opregion_suspend() to intel_display_driver_shutdown_late()

[Jani Nikula <jani.nikula@intel.com>]

Add intel_opregion_suspend() to
intel_display_driver_shutdown_late(). This unifies the behaviour with
intel_display_driver_pm_suspend_late(), calling intel_opregion_suspend()
with IRQs disabled.

For xe, this delays intel_opregion_suspend() until after IRQ and GT
shutdown.

For i915, this starts calling intel_opregion_suspend() on shutdown.

v2: Move the call to intel_display_driver_shutdown_late() (Imre)

Cc: Imre Deak <imre.deak@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/display/intel_display_driver.c | 2 ++
 drivers/gpu/drm/xe/display/xe_display.c             | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/i915/display/intel_display_driver.c b/drivers/gpu/drm/i915/display/intel_display_driver.c
index abab457bce3a..f11cff0e1294 100644
--- a/drivers/gpu/drm/i915/display/intel_display_driver.c
+++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
@@ -711,6 +711,8 @@ void intel_display_driver_shutdown_late(struct intel_display *display)
 	if (!HAS_DISPLAY(display))
 		return;
 
+	intel_opregion_suspend(display, PCI_D3cold);
+
 	/*
 	 * The only requirement is to reboot with display DC states disabled,
 	 * for now leaving all display power wells in the INIT power domain
diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index b013ec00b75d..1e37b1c29bb1 100644
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -176,8 +176,6 @@ void xe_display_shutdown(struct xe_device *xe)
 		return;
 
 	intel_display_driver_shutdown(display);
-
-	intel_opregion_suspend(display, PCI_D3cold);
 }
 
 void xe_display_shutdown_late(struct xe_device *xe)
-- 
2.47.3