Re: [PATCH] drm/xe: Do clean shutdown also when using flr

[Maarten Lankhorst <maarten.lankhorst@linux.intel.com>]

Hey,

Yeah, initially it was ok to just do a FLR since it gave no issues compared to cleaning up nicely,
and allowed us to shutdown even if it was the driver that crashed. I guess it's better to shut down
cleanly before doing a FLR instead now that bugs were found.

Reviewed-by: Maarten Lankhorst <dev@lankhorst.se>

Den 2025-10-31 kl. 13:23, skrev Jouni Högander:
> Currently Xe driver is triggering flr without any clean-up on
> shutdown. This is causing random warnings from pending related works as the
> underlying hardware is reset in the middle of their execution.
> 
> Fix this by performing clean shutdown also when using flr.
> 
> Fixes: 501d799a47e2 ("drm/xe: Wire up device shutdown handler")
> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
> Signed-off-by: Jouni Högander <jouni.hogander@intel.com>
> ---
>  drivers/gpu/drm/xe/xe_device.c | 18 +++++++++---------
>  1 file changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_device.c b/drivers/gpu/drm/xe/xe_device.c
> index 86d5960476af6..6156be15affba 100644
> --- a/drivers/gpu/drm/xe/xe_device.c
> +++ b/drivers/gpu/drm/xe/xe_device.c
> @@ -988,21 +988,21 @@ void xe_device_remove(struct xe_device *xe)
>  
>  void xe_device_shutdown(struct xe_device *xe)
>  {
> +	struct xe_gt *gt;
> +	u8 id;
> +
>  	drm_dbg(&xe->drm, "Shutting down device\n");
>  
> -	if (xe_driver_flr_disabled(xe)) {
> -		struct xe_gt *gt;
> -		u8 id;
> +	xe_display_pm_shutdown(xe);
>  
> -		xe_display_pm_shutdown(xe);
> +	xe_irq_suspend(xe);
>  
> -		xe_irq_suspend(xe);
> +	for_each_gt(gt, xe, id)
> +		xe_gt_shutdown(gt);
>  
> -		for_each_gt(gt, xe, id)
> -			xe_gt_shutdown(gt);
> +	xe_display_pm_shutdown_late(xe);
>  
> -		xe_display_pm_shutdown_late(xe);
> -	} else {
> +	if (!xe_driver_flr_disabled(xe)) {
>  		/* BOOM! */
>  		__xe_driver_flr(xe);
>  	}