Intel-XE Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] drm/xe/pm: Handle GT resume failure
@ 2025-12-20  7:36 Raag Jadav
  2025-12-21  3:08 ` Vivi, Rodrigo
                   ` (5 more replies)
  0 siblings, 6 replies; 14+ messages in thread
From: Raag Jadav @ 2025-12-20  7:36 UTC (permalink / raw)
  To: intel-xe
  Cc: rodrigo.vivi, matthew.brost, michal.wajdeczko, badal.nilawar,
	karthik.poosa, matthew.d.roper, dev, jani.nikula, ville.syrjala,
	uma.shankar, Raag Jadav

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>
---
 drivers/gpu/drm/xe/xe_pm.c | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/xe/xe_pm.c b/drivers/gpu/drm/xe/xe_pm.c
index 4390ba69610d..559cf5490ac0 100644
--- 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);
-- 
2.43.0


^ permalink raw reply related	[flat|nested] 14+ messages in thread

end of thread, other threads:[~2026-01-10  7:35 UTC | newest]

Thread overview: 14+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-12-20  7:36 [PATCH v2] drm/xe/pm: Handle GT resume failure Raag Jadav
2025-12-21  3:08 ` Vivi, Rodrigo
2026-01-08 11:54   ` Raag Jadav
2026-01-08 20:34     ` Rodrigo Vivi
2025-12-22 10:30 ` ✓ CI.KUnit: success for drm/xe/pm: Handle GT resume failure (rev2) Patchwork
2025-12-22 11:05 ` ✓ Xe.CI.BAT: " Patchwork
2025-12-22 11:49 ` ✓ CI.KUnit: " Patchwork
2025-12-22 12:28 ` ✓ Xe.CI.Full: " Patchwork
2026-01-09  2:44 ` [PATCH v2] drm/xe/pm: Handle GT resume failure Nilawar, Badal
2026-01-09  5:58   ` Raag Jadav
2026-01-09 11:07     ` Nilawar, Badal
2026-01-09 13:43       ` Raag Jadav
2026-01-09 14:50         ` Vivi, Rodrigo
2026-01-10  7:35           ` Raag Jadav

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox