Re: [PATCH v2] drm/xe/pm: Handle GT resume failure

[Raag Jadav <raag.jadav@intel.com>]

On Fri, Jan 09, 2026 at 08:14:05AM +0530, Nilawar, Badal wrote:
> On 20-12-2025 13:06, Raag Jadav wrote:
> > 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;
> 
> GT and SAMedia are different entities (even if both are treated as GTs in
> software), should we not continue attempting to resume the remaining GT even
> if resuming first one fails.

My limited understanding is that GUI needs render engine, which the user
won't be getting back either way.

Raag

> > +	}
> > +	/*
> > +	 * 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);