diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c index 306c853dd07a..8da4c457a4a0 100644 --- a/drivers/gpu/drm/xe/display/xe_display.c +++ b/drivers/gpu/drm/xe/display/xe_display.c @@ -362,7 +362,7 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe) return; } - intel_hpd_poll_enable(display); + intel_display_driver_pm_runtime_suspend(display); } /* after irq suspend */ @@ -380,18 +380,21 @@ 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); } /* before irq resume */ void xe_display_pm_runtime_resume_early(struct xe_device *xe) { + struct intel_display *display = xe->display; + if (!xe->info.probe_display) return; if (xe->d3cold.allowed) return; + + intel_display_driver_pm_runtime_resume_early(display); } /* after irq resume */ @@ -407,9 +410,7 @@ 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(display); }