On Mon, 15 Jun 2026, Jani Nikula <[email protected]> wrote: > With the special d3cold handling in xe runtime suspend/resume separated, > unify the non-d3cold paths with i915. There are multiple changes here at > once that probably wouldn't make much sense to split out further. > > Add the call to intel_display_driver_pm_runtime_suspend(), which in turn > starts calling intel_display_power_runtime_suspend(). Deep down, this > should take care of intel_dmc_wl_flush_release_work(), allowing us to > drop the extra call in xe_display_pm_runtime_suspend_late(). > > Add the call to intel_display_driver_pm_runtime_suspend_late(), which > starts calling intel_opregion_notify_adapter(). The > intel_hpd_poll_enable() call is also done here, postponed from the > previous location in xe_display_pm_runtime_suspend(). > > Add the call to intel_display_driver_pm_runtime_resume_early(), which > contains the intel_display_power_runtime_resume() and > intel_opregion_notify_adapter() counterparts found in > intel_display_power_runtime_suspend() and > intel_display_power_runtime_suspend_late(). (They are not symmetric.) > > Finally, intel_display_driver_pm_runtime_resume() replaces the direct > calls to intel_hpd_init(), intel_hpd_poll_disable(), and > skl_watermark_ipc_update().
So this whole thing doesn't work, because both intel_display_power_runtime_suspend() and intel_display_power_runtime_resume() need to be called with irqs disabled. More shuffling is needed in xe, probably also i915. BR, Jani. > > Cc: Rodrigo Vivi <[email protected]> > Reviewed-by: Ville Syrjälä <[email protected]> > Signed-off-by: Jani Nikula <[email protected]> > --- > drivers/gpu/drm/xe/display/xe_display.c | 10 ++++------ > 1 file changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_display.c > b/drivers/gpu/drm/xe/display/xe_display.c > index bdafc010fae1..8c147610f721 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -379,7 +379,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe) > return; > } > > - intel_hpd_poll_enable(display); > + intel_display_driver_pm_runtime_suspend(display); > } > > void xe_display_pm_runtime_suspend_late(struct xe_device *xe) > @@ -396,8 +396,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device > *xe) > return; > } > > - /* Ensure the wakelock release work gets flushed */ > - intel_dmc_wl_flush_release_work(display); > + intel_display_driver_pm_runtime_suspend_late(display); > } > > void xe_display_pm_runtime_resume(struct xe_device *xe) > @@ -412,9 +411,8 @@ void xe_display_pm_runtime_resume(struct xe_device *xe) > return; > } > > - intel_hpd_init(display); > - intel_hpd_poll_disable(display); > - skl_watermark_ipc_update(display); > + intel_display_driver_pm_runtime_resume_early(display); > + intel_display_driver_pm_runtime_resume(display); > } -- Jani Nikula, Intel
