[PATCH v2 5/5] drm/xe: Remove set_job_timeout_ms() from exec_queue_ops

[Matthew Brost]

On Wed, Jan 03, 2024 at 10:44:08AM -0800, Brian Welty wrote:
> This function is no longer used as the job_timeout is now
> updated prior to calling queue_ops.init().
> 
> Signed-off-by: Brian Welty <brian.welty at intel.com>

Reviewed-by: Matthew Brost <matthew.brost at intel.com>

> ---
>  drivers/gpu/drm/xe/xe_exec_queue_types.h |  2 --
>  drivers/gpu/drm/xe/xe_execlist.c         |  8 --------
>  drivers/gpu/drm/xe/xe_guc_submit.c       | 16 ----------------
>  3 files changed, 26 deletions(-)
> 
> diff --git a/drivers/gpu/drm/xe/xe_exec_queue_types.h b/drivers/gpu/drm/xe/xe_exec_queue_types.h
> index 6ae4f4e2ddca..aed66295bfc4 100644
> --- a/drivers/gpu/drm/xe/xe_exec_queue_types.h
> +++ b/drivers/gpu/drm/xe/xe_exec_queue_types.h
> @@ -198,8 +198,6 @@ struct xe_exec_queue_ops {
>  	int (*set_timeslice)(struct xe_exec_queue *q, u32 timeslice_us);
>  	/** @set_preempt_timeout: Set preemption timeout for exec queue */
>  	int (*set_preempt_timeout)(struct xe_exec_queue *q, u32 preempt_timeout_us);
> -	/** @set_job_timeout: Set job timeout for exec queue */
> -	int (*set_job_timeout)(struct xe_exec_queue *q, u32 job_timeout_ms);
>  	/**
>  	 * @suspend: Suspend exec queue from executing, allowed to be called
>  	 * multiple times in a row before resume with the caveat that
> diff --git a/drivers/gpu/drm/xe/xe_execlist.c b/drivers/gpu/drm/xe/xe_execlist.c
> index 96b5224eb478..58dfe6a78ffe 100644
> --- a/drivers/gpu/drm/xe/xe_execlist.c
> +++ b/drivers/gpu/drm/xe/xe_execlist.c
> @@ -418,13 +418,6 @@ static int execlist_exec_queue_set_preempt_timeout(struct xe_exec_queue *q,
>  	return 0;
>  }
>  
> -static int execlist_exec_queue_set_job_timeout(struct xe_exec_queue *q,
> -					       u32 job_timeout_ms)
> -{
> -	/* NIY */
> -	return 0;
> -}
> -
>  static int execlist_exec_queue_suspend(struct xe_exec_queue *q)
>  {
>  	/* NIY */
> @@ -455,7 +448,6 @@ static const struct xe_exec_queue_ops execlist_exec_queue_ops = {
>  	.set_priority = execlist_exec_queue_set_priority,
>  	.set_timeslice = execlist_exec_queue_set_timeslice,
>  	.set_preempt_timeout = execlist_exec_queue_set_preempt_timeout,
> -	.set_job_timeout = execlist_exec_queue_set_job_timeout,
>  	.suspend = execlist_exec_queue_suspend,
>  	.suspend_wait = execlist_exec_queue_suspend_wait,
>  	.resume = execlist_exec_queue_resume,
> diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
> index 392cbde62957..7c29b8333c71 100644
> --- a/drivers/gpu/drm/xe/xe_guc_submit.c
> +++ b/drivers/gpu/drm/xe/xe_guc_submit.c
> @@ -1350,21 +1350,6 @@ static int guc_exec_queue_set_preempt_timeout(struct xe_exec_queue *q,
>  	return 0;
>  }
>  
> -static int guc_exec_queue_set_job_timeout(struct xe_exec_queue *q, u32 job_timeout_ms)
> -{
> -	struct xe_gpu_scheduler *sched = &q->guc->sched;
> -	struct xe_guc *guc = exec_queue_to_guc(q);
> -	struct xe_device *xe = guc_to_xe(guc);
> -
> -	xe_assert(xe, !exec_queue_registered(q));
> -	xe_assert(xe, !exec_queue_banned(q));
> -	xe_assert(xe, !exec_queue_killed(q));
> -
> -	sched->base.timeout = job_timeout_ms;
> -
> -	return 0;
> -}
> -
>  static int guc_exec_queue_suspend(struct xe_exec_queue *q)
>  {
>  	struct xe_sched_msg *msg = q->guc->static_msgs + STATIC_MSG_SUSPEND;
> @@ -1415,7 +1400,6 @@ static const struct xe_exec_queue_ops guc_exec_queue_ops = {
>  	.set_priority = guc_exec_queue_set_priority,
>  	.set_timeslice = guc_exec_queue_set_timeslice,
>  	.set_preempt_timeout = guc_exec_queue_set_preempt_timeout,
> -	.set_job_timeout = guc_exec_queue_set_job_timeout,
>  	.suspend = guc_exec_queue_suspend,
>  	.suspend_wait = guc_exec_queue_suspend_wait,
>  	.resume = guc_exec_queue_resume,
> -- 
> 2.43.0
>