On Fri, May 29, 2026 at 02:03:51PM +0300, Jani Nikula wrote: > The shutdown functions get called from the struct pci_driver .shutdown > hook, not through the struct dev_pm_ops hooks. Name accordingly, > dropping the "pm" from the name, even if shutdown has a lot of > similarities with suspend. > > Signed-off-by: Jani Nikula <[email protected]>
Reviewed-by: Ville Syrjälä <[email protected]> > --- > drivers/gpu/drm/xe/display/xe_display.c | 4 ++-- > drivers/gpu/drm/xe/display/xe_display.h | 10 ++++++---- > drivers/gpu/drm/xe/xe_device.c | 4 ++-- > 3 files changed, 10 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/xe/display/xe_display.c > b/drivers/gpu/drm/xe/display/xe_display.c > index d1c450a18713..3567b3018083 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.c > +++ b/drivers/gpu/drm/xe/display/xe_display.c > @@ -326,7 +326,7 @@ void xe_display_pm_suspend(struct xe_device *xe) > intel_dmc_suspend(display); > } > > -void xe_display_pm_shutdown(struct xe_device *xe) > +void xe_display_shutdown(struct xe_device *xe) > { > struct intel_display *display = xe->display; > > @@ -400,7 +400,7 @@ void xe_display_pm_runtime_suspend_late(struct xe_device > *xe) > intel_dmc_wl_flush_release_work(display); > } > > -void xe_display_pm_shutdown_late(struct xe_device *xe) > +void xe_display_shutdown_late(struct xe_device *xe) > { > struct intel_display *display = xe->display; > > diff --git a/drivers/gpu/drm/xe/display/xe_display.h > b/drivers/gpu/drm/xe/display/xe_display.h > index 60291cb154df..e5f9aed93206 100644 > --- a/drivers/gpu/drm/xe/display/xe_display.h > +++ b/drivers/gpu/drm/xe/display/xe_display.h > @@ -29,15 +29,16 @@ int xe_display_init(struct xe_device *xe); > void xe_display_register(struct xe_device *xe); > void xe_display_unregister(struct xe_device *xe); > > +void xe_display_shutdown(struct xe_device *xe); > +void xe_display_shutdown_late(struct xe_device *xe); > + > void xe_display_irq_handler(struct xe_device *xe, u32 master_ctl); > void xe_display_irq_enable(struct xe_device *xe, u32 gu_misc_iir); > void xe_display_irq_reset(struct xe_device *xe); > void xe_display_irq_postinstall(struct xe_device *xe); > > void xe_display_pm_suspend(struct xe_device *xe); > -void xe_display_pm_shutdown(struct xe_device *xe); > void xe_display_pm_suspend_late(struct xe_device *xe); > -void xe_display_pm_shutdown_late(struct xe_device *xe); > void xe_display_pm_resume_early(struct xe_device *xe); > void xe_display_pm_resume(struct xe_device *xe); > void xe_display_pm_runtime_suspend(struct xe_device *xe); > @@ -65,15 +66,16 @@ static inline int xe_display_init(struct xe_device *xe) { > return 0; } > static inline void xe_display_register(struct xe_device *xe) {} > static inline void xe_display_unregister(struct xe_device *xe) {} > > +static inline void xe_display_shutdown(struct xe_device *xe) {} > +static inline void xe_display_shutdown_late(struct xe_device *xe) {} > + > static inline void xe_display_irq_handler(struct xe_device *xe, u32 > master_ctl) {} > static inline void xe_display_irq_enable(struct xe_device *xe, u32 > gu_misc_iir) {} > static inline void xe_display_irq_reset(struct xe_device *xe) {} > static inline void xe_display_irq_postinstall(struct xe_device *xe) {} > > static inline void xe_display_pm_suspend(struct xe_device *xe) {} > -static inline void xe_display_pm_shutdown(struct xe_device *xe) {} > static inline void xe_display_pm_suspend_late(struct xe_device *xe) {} > -static inline void xe_display_pm_shutdown_late(struct xe_device *xe) {} > static inline void xe_display_pm_resume_early(struct xe_device *xe) {} > static inline void xe_display_pm_resume(struct xe_device *xe) {} > static inline void xe_display_pm_runtime_suspend(struct xe_device *xe) {} > diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c > index d224861b6f6f..ec065b168bb9 100644 > --- a/drivers/gpu/drm/xe/xe_device.c > +++ b/drivers/gpu/drm/xe/xe_device.c > @@ -1128,14 +1128,14 @@ void xe_device_shutdown(struct xe_device *xe) > > drm_dbg(&xe->drm, "Shutting down device\n"); > > - xe_display_pm_shutdown(xe); > + xe_display_shutdown(xe); > > xe_irq_suspend(xe); > > for_each_gt(gt, xe, id) > xe_gt_shutdown(gt); > > - xe_display_pm_shutdown_late(xe); > + xe_display_shutdown_late(xe); > > if (!xe_driver_flr_disabled(xe)) { > /* BOOM! */ > -- > 2.47.3 -- Ville Syrjälä Intel
