[PATCH v6 4/4] drm/xe/xe_guc_submit: Declare reset if banned or killed

[Cavitt, Jonathan]

-----Original Message-----
From: Cavitt, Jonathan <jonathan.cavitt at intel.com> 
Sent: Monday, April 15, 2024 2:50 PM
To: intel-xe at lists.freedesktop.org
Cc: Cavitt, Jonathan <jonathan.cavitt at intel.com>; Gupta, saurabhg <saurabhg.gupta at intel.com>; Vishwanathapura, Niranjana <niranjana.vishwanathapura at intel.com>; Welty, Brian <brian.welty at intel.com>; Roper, Matthew D <matthew.d.roper at intel.com>; Brost, Matthew <matthew.brost at intel.com>; Harrison, John C <john.c.harrison at intel.com>
Subject: [PATCH v6 4/4] drm/xe/xe_guc_submit: Declare reset if banned or killed
> 
> Add an additional condition to the reset_status guc_exec_queue_op that
> returns true if the exec queue has been banned or killed.  The
> reset_status op is only used for exiting any xe_wait_user_fence_ioctl
> that waits on an exec queue without timing out, so doing this will exit
> the ioctl early in cases where the exec queue can no longer function,
> such as after a GuC stop during a reset.
> 
> Suggested-by: Matthew Brost <matthew.brost at intel.com>
> Signed-off-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
> Reviewed-by: Stuart Summers <stuart.summers at intel.com>
> ---
>  drivers/gpu/drm/xe/xe_guc_submit.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 89cf84a5f888d..f964c0f118323 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1369,7 +1369,7 @@ static void guc_exec_queue_resume(struct xe_exec_queue *q)
>  
>  static bool guc_exec_queue_reset_status(struct xe_exec_queue *q)
>  {
> -	return exec_queue_reset(q);
> +	return exec_queue_reset(q) || exec_queue_killed_or_banned(q);

Rebased recently.  exec_queue_killed_or_banned is now exec_queue_killed_or_banned_or_wedged.
-Jonathan Cavitt

>  }
>  
>  /*
> -- 
> 2.25.1
> 
>