drm/xe/pm: Handle GT resume failure

We've been historically ignoring GT resume failure. Since the function
can return error, handle it properly.

v2: Bring up display before bailing (Matt Roper, Rodrigo)

Signed-off-by: Raag Jadav <raag.jadav@intel.com>
Link: https://patch.msgid.link/20251220073657.166810-1-raag.jadav@intel.com
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 4390ba69610d822e6a49ed9ca9f4cfe211a58028..559cf5490ac0059f6861655557c5e8e8fef4f3de 100644 (file)
--- a/drivers/gpu/drm/xe/xe_pm.c
+++ b/drivers/gpu/drm/xe/xe_pm.c
@@ -260,10 +260,19 @@ int xe_pm_resume(struct xe_device *xe)
 
        xe_irq_resume(xe);
 
-       for_each_gt(gt, xe, id)
-               xe_gt_resume(gt);
+       for_each_gt(gt, xe, id) {
+               err = xe_gt_resume(gt);
+               if (err)
+                       break;
+       }
 
+       /*
+        * Try to bring up display before bailing from GT resume failure,
+        * so we don't leave the user clueless with a blank screen.
+        */
        xe_display_pm_resume(xe);
+       if (err)
+               goto err;
 
        err = xe_bo_restore_late(xe);
        if (err)
@@ -656,10 +665,19 @@ int xe_pm_runtime_resume(struct xe_device *xe)
 
        xe_irq_resume(xe);
 
-       for_each_gt(gt, xe, id)
-               xe->d3cold.allowed ? xe_gt_resume(gt) : xe_gt_runtime_resume(gt);
+       for_each_gt(gt, xe, id) {
+               err = xe->d3cold.allowed ? xe_gt_resume(gt) : xe_gt_runtime_resume(gt);
+               if (err)
+                       break;
+       }
 
+       /*
+        * Try to bring up display before bailing from GT resume failure,
+        * so we don't leave the user clueless with a blank screen.
+        */
        xe_display_pm_runtime_resume(xe);
+       if (err)
+               goto out;
 
        if (xe->d3cold.allowed) {
                err = xe_bo_restore_late(xe);