[PATCH v5 3/4] drm/xe/xe_guc_submit: Allow lr exec queues to be banned

[Summers, Stuart]

On Mon, 2024-04-15 at 11:46 -0700, Jonathan Cavitt wrote:
> LR queues currently don't get banned during a GT/GuC reset because
> they
> lack a job.  Though they don't have a job to detect the reset status
> of,
> it's still possible to tell when they should be banned by looking at
> the
> LRC: if the LRC head and tail don't match, then the exec queue should
> be
> banned and cleaned up.
> 
> This also requires swapping the usage of xe_sched_tdr_queue_imm with
> xe_guc_exec_queue_trigger_cleanup, as the former is specific to non-
> lr
> exec queues.
> 
> Suggested-by: Matthew Brost <matthew.brost at intel.com>
> Signed-off-by: Jonathan Cavitt <jonathan.cavitt at intel.com>
> Reviewed-by: Matthew Brost <matthew.brost at intel.com>
> ---
> 
> v2:
> - Fix Subject line
> - Modify change slightly to remove need for "ban" boolean
> 
> v3: Revert change involving "ban" boolean to version 1
> 
> v4: Add missing semicolon and remove whitespace
> 
> v5: Use new xe_lrc_ring_tail function
> 
>  drivers/gpu/drm/xe/xe_guc_submit.c | 12 ++++++++++--
>  1 file changed, 10 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c
> b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 7b6c033a5496b..82406637c6c5a 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1422,15 +1422,23 @@ static void guc_exec_queue_stop(struct xe_guc
> *guc, struct xe_exec_queue *q)
>          */
>         if (!(q->flags & (EXEC_QUEUE_FLAG_KERNEL |
> EXEC_QUEUE_FLAG_VM))) {
>                 struct xe_sched_job *job =
> xe_sched_first_pending_job(sched);
> +               bool ban = false;
>  
>                 if (job) {
>                         if ((xe_sched_job_started(job) &&
>                             !xe_sched_job_completed(job)) ||
>                             xe_sched_invalidate_job(job, 2)) {
>                                 trace_xe_sched_job_ban(job);
> -                               set_exec_queue_banned(q);
> -                               xe_sched_tdr_queue_imm(&q->guc-
> >sched);
> +                               ban = true;
>                         }
> +               } else if (xe_exec_queue_is_lr(q) &&
> +                          (xe_lrc_ring_head(q->lrc) !=
> xe_lrc_ring_tail(q->lrc))) {

Reviewed-by: Stuart Summers <stuart.summers at intel.com>

> +                       ban = true;
> +               }
> +
> +               if (ban) {
> +                       set_exec_queue_banned(q);
> +                       xe_guc_exec_queue_trigger_cleanup(q);
>                 }
>         }
>  }