drm/xe: Handle polling only for system s/r in xe_display_pm_suspend/resume()

This is a preparation for the follow-up patch where polling
will be handled properly for all cases during runtime suspend/resume.

v2: rebased

Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Signed-off-by: Vinod Govindapillai <vinod.govindapillai@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240823112148.327015-3-vinod.govindapillai@intel.com

diff --git a/drivers/gpu/drm/xe/display/xe_display.c b/drivers/gpu/drm/xe/display/xe_display.c
index ad7fc5137b4290cbd724df4e37bdb9c4af1c6915..00dd38f6177b1c198c86c674f18bf258b29e78b3 100644 (file)
--- a/drivers/gpu/drm/xe/display/xe_display.c
+++ b/drivers/gpu/drm/xe/display/xe_display.c
@@ -321,14 +321,11 @@ void xe_display_pm_suspend(struct xe_device *xe, bool runtime)
         */
        intel_power_domains_disable(xe);
        intel_fbdev_set_suspend(&xe->drm, FBINFO_STATE_SUSPENDED, true);
-       if (has_display(xe)) {
+       if (!runtime && has_display(xe)) {
                drm_kms_helper_poll_disable(&xe->drm);
-               if (!runtime)
-                       intel_display_driver_disable_user_access(xe);
-       }
-
-       if (!runtime)
+               intel_display_driver_disable_user_access(xe);
                intel_display_driver_suspend(xe);
+       }
 
        xe_display_flush_cleanup_work(xe);
 
@@ -387,15 +384,12 @@ void xe_display_pm_resume(struct xe_device *xe, bool runtime)
 
        /* MST sideband requires HPD interrupts enabled */
        intel_dp_mst_resume(xe);
-       if (!runtime)
+       if (!runtime && has_display(xe)) {
                intel_display_driver_resume(xe);
-
-       if (has_display(xe)) {
                drm_kms_helper_poll_enable(&xe->drm);
-               if (!runtime)
-                       intel_display_driver_enable_user_access(xe);
+               intel_display_driver_enable_user_access(xe);
+               intel_hpd_poll_disable(xe);
        }
-       intel_hpd_poll_disable(xe);
 
        intel_opregion_resume(display);