kevin/linux
1
Fork 0
Code

drm/xe/display: Separate the d3cold and non-d3cold runtime PM handling

Browse Source 
For clarity separate the d3cold and non-d3cold runtime PM handling. The
only change in behavior is disabling polling later during runtime
resume. This shouldn't make a difference, since the poll disabling is
handled from a work, which could run at any point wrt. the runtime
resume handler. The work will also require a runtime PM reference,
syncing it with the resume handler.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Reviewed-by: Jonathan Cavitt <jonathan.cavitt@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20241009194358.1321200-4-imre.deak@intel.com
(cherry picked from commit a4de6beb83fc5adee788518350247c629568901e)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
This commit is contained in:
Imre Deak 2024-10-09 22:43:57 +03:00 committed by Lucas De Marchi
parent 25f2ff5383
commit dcb6c1d071
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
drivers/gpu/drm/xe/display/xe_display.c
View File

@ -342,6 +342,9 @@ static void __xe_display_pm_suspend(struct xe_device *xe, bool runtime)
intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold); intel_opregion_suspend(display, s2idle ? PCI_D1 : PCI_D3cold);
intel_dmc_suspend(xe); intel_dmc_suspend(xe);
if (runtime && has_display(xe))
intel_hpd_poll_enable(xe);
} }
void xe_display_pm_suspend(struct xe_device *xe) void xe_display_pm_suspend(struct xe_device *xe)
@ -354,8 +357,10 @@ void xe_display_pm_runtime_suspend(struct xe_device *xe)
if (!xe->info.probe_display) if (!xe->info.probe_display)
return; return;
if (xe->d3cold.allowed) if (xe->d3cold.allowed) {
__xe_display_pm_suspend(xe, true); __xe_display_pm_suspend(xe, true);
return;
}
intel_hpd_poll_enable(xe); intel_hpd_poll_enable(xe);
} }
@ -405,9 +410,11 @@ static void __xe_display_pm_resume(struct xe_device *xe, bool runtime)
intel_display_driver_resume(xe); intel_display_driver_resume(xe);
drm_kms_helper_poll_enable(&xe->drm); drm_kms_helper_poll_enable(&xe->drm);
intel_display_driver_enable_user_access(xe); intel_display_driver_enable_user_access(xe);
intel_hpd_poll_disable(xe);
} }
if (has_display(xe))
intel_hpd_poll_disable(xe);
intel_opregion_resume(display); intel_opregion_resume(display);
intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false); intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_RUNNING, false);
@ -425,10 +432,12 @@ void xe_display_pm_runtime_resume(struct xe_device *xe)
if (!xe->info.probe_display) if (!xe->info.probe_display)
return; return;
intel_hpd_poll_disable(xe); if (xe->d3cold.allowed) {
if (xe->d3cold.allowed)
__xe_display_pm_resume(xe, true); __xe_display_pm_resume(xe, true);
return;
}
intel_hpd_poll_disable(xe);
} }