Commit 801e8c7e authored by Brian Welty's avatar Brian Welty Committed by Matthew Brost

drm/xe: Remove set_job_timeout_ms() from exec_queue_ops

This function is no longer used as the job_timeout is now
updated prior to calling queue_ops.init().
Signed-off-by: default avatarBrian Welty <brian.welty@intel.com>
Signed-off-by: default avatarMatthew Brost <matthew.brost@intel.com>
Reviewed-by: default avatarMatthew Brost <matthew.brost@intel.com>
parent 25ce7c50
...@@ -200,8 +200,6 @@ struct xe_exec_queue_ops { ...@@ -200,8 +200,6 @@ struct xe_exec_queue_ops {
int (*set_timeslice)(struct xe_exec_queue *q, u32 timeslice_us); int (*set_timeslice)(struct xe_exec_queue *q, u32 timeslice_us);
/** @set_preempt_timeout: Set preemption timeout for exec queue */ /** @set_preempt_timeout: Set preemption timeout for exec queue */
int (*set_preempt_timeout)(struct xe_exec_queue *q, u32 preempt_timeout_us); 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 * @suspend: Suspend exec queue from executing, allowed to be called
* multiple times in a row before resume with the caveat that * multiple times in a row before resume with the caveat that
......
...@@ -418,13 +418,6 @@ static int execlist_exec_queue_set_preempt_timeout(struct xe_exec_queue *q, ...@@ -418,13 +418,6 @@ static int execlist_exec_queue_set_preempt_timeout(struct xe_exec_queue *q,
return 0; 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) static int execlist_exec_queue_suspend(struct xe_exec_queue *q)
{ {
/* NIY */ /* NIY */
...@@ -455,7 +448,6 @@ static const struct xe_exec_queue_ops execlist_exec_queue_ops = { ...@@ -455,7 +448,6 @@ static const struct xe_exec_queue_ops execlist_exec_queue_ops = {
.set_priority = execlist_exec_queue_set_priority, .set_priority = execlist_exec_queue_set_priority,
.set_timeslice = execlist_exec_queue_set_timeslice, .set_timeslice = execlist_exec_queue_set_timeslice,
.set_preempt_timeout = execlist_exec_queue_set_preempt_timeout, .set_preempt_timeout = execlist_exec_queue_set_preempt_timeout,
.set_job_timeout = execlist_exec_queue_set_job_timeout,
.suspend = execlist_exec_queue_suspend, .suspend = execlist_exec_queue_suspend,
.suspend_wait = execlist_exec_queue_suspend_wait, .suspend_wait = execlist_exec_queue_suspend_wait,
.resume = execlist_exec_queue_resume, .resume = execlist_exec_queue_resume,
......
...@@ -1350,21 +1350,6 @@ static int guc_exec_queue_set_preempt_timeout(struct xe_exec_queue *q, ...@@ -1350,21 +1350,6 @@ static int guc_exec_queue_set_preempt_timeout(struct xe_exec_queue *q,
return 0; 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) static int guc_exec_queue_suspend(struct xe_exec_queue *q)
{ {
struct xe_sched_msg *msg = q->guc->static_msgs + STATIC_MSG_SUSPEND; 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 = { ...@@ -1415,7 +1400,6 @@ static const struct xe_exec_queue_ops guc_exec_queue_ops = {
.set_priority = guc_exec_queue_set_priority, .set_priority = guc_exec_queue_set_priority,
.set_timeslice = guc_exec_queue_set_timeslice, .set_timeslice = guc_exec_queue_set_timeslice,
.set_preempt_timeout = guc_exec_queue_set_preempt_timeout, .set_preempt_timeout = guc_exec_queue_set_preempt_timeout,
.set_job_timeout = guc_exec_queue_set_job_timeout,
.suspend = guc_exec_queue_suspend, .suspend = guc_exec_queue_suspend,
.suspend_wait = guc_exec_queue_suspend_wait, .suspend_wait = guc_exec_queue_suspend_wait,
.resume = guc_exec_queue_resume, .resume = guc_exec_queue_resume,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment