Re: [PATCH 2/4] drm/{i915,xe}: move intel_opregion_suspend() to intel_display_driver_pm_suspend_late()

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

On Wed, 23 Sep 2026, Imre Deak <imre.deak@intel.com> wrote:
> On Tue, Sep 22, 2026 at 06:00:50PM +0300, Jani Nikula wrote:
>> 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.
>
> Imo the main reason is that it should be called with interrupts
> disabled. At least not sure how cancel_work_sync(asle_work) could work
> otherwise.
>
>> 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.
>
> I think it is PCI_D3cold for i915 already before this patch, since
> acpi_target_system_state() is ACPI_STATE_S4 in that case. If so, the
> hibernation param from i915_drm_suspend_late() could be also removed.
> But need to check this more to be sure.

I think Ville mentioned something similar in the past, but when I tried
to track this in the source I just couldn't be certain at all. :/

>
>> 
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>>  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 77009dca7d0d..abab457bce3a 100644
>> --- a/drivers/gpu/drm/i915/display/intel_display_driver.c
>> +++ b/drivers/gpu/drm/i915/display/intel_display_driver.c
>> @@ -783,6 +783,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);
>
> This leaves intel_opregion_resume() called from
> intel_display_driver_pm_resume() in an assymetric way, but I suppose
> that could be addressed later:
>
> Reviewed-by: Imre Deak <imre.deak@intel.com>
>
>> +
>>  	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 9e047c27a153..293099fe6639 100644
>> --- a/drivers/gpu/drm/i915/i915_driver.c
>> +++ b/drivers/gpu/drm/i915/i915_driver.c
>> @@ -1075,7 +1075,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);
>>  
>> @@ -1089,9 +1088,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 184a5a237880..b013ec00b75d 100644
>> --- a/drivers/gpu/drm/xe/display/xe_display.c
>> +++ b/drivers/gpu/drm/xe/display/xe_display.c
>> @@ -246,14 +246,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
>> 

-- 
Jani Nikula, Intel