Unverified Commit 644673a6 authored by Raag Jadav's avatar Raag Jadav Committed by Rodrigo Vivi
Browse files

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: default avatarRaag Jadav <raag.jadav@intel.com>
Link: https://patch.msgid.link/20251220073657.166810-1-raag.jadav@intel.com


Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
parent 4e88de31

drivers/gpu/drm/xe/xe_pm.c

+22 −4
Original line number Diff line number Diff line
@@ -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);