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

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>

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index 1c25c4f6a53b3882d6b2871c3956b9b4e8166232..fa44fe802858c00a5669203abc04b77b7a01bdca 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -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_dmc_suspend(xe);
+
+       if (runtime && has_display(xe))
+               intel_hpd_poll_enable(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)
                return;
 
-       if (xe->d3cold.allowed)
+       if (xe->d3cold.allowed) {
                __xe_display_pm_suspend(xe, true);
+               return;
+       }
 
        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);
                drm_kms_helper_poll_enable(&xe->drm);
                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_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)
                return;
 
-       intel_hpd_poll_disable(xe);
-
-       if (xe->d3cold.allowed)
+       if (xe->d3cold.allowed) {
                __xe_display_pm_resume(xe, true);
+               return;
+       }
+
+       intel_hpd_poll_disable(xe);
 }