drm/xe: Add exec_queue.sched_props.job_timeout_ms

[ Upstream commit 6ae24344e2e3e12e06f7b382af4bba2fd417b2ff ]

The purpose here is to allow to optimize exec_queue_set_job_timeout()
in follow-on patch.  Currently it does q->ops->set_job_timeout(...).
But we'd like to apply exec_queue_user_extensions much earlier and
q->ops cannot be called before __xe_exec_queue_init().

It will be much more efficient to instead only have to set
q->sched_props.job_timeout_ms when applying user extensions. That value
will then be used during q->ops->init().

Signed-off-by: Brian Welty <brian.welty@intel.com>
Signed-off-by: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Stable-dep-of: 9c1256369c10 ("drm/xe/guc_submit: use jiffies for job timeout")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index 49223026c89fd5e3626be84a9687774d29b6bcb2..a176d9ad6d1b8fb8f64b93a0f80c8186aea84133 100644 (file)
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -66,6 +66,8 @@ static struct xe_exec_queue *__xe_exec_queue_create(struct xe_device *xe,
        q->sched_props.timeslice_us = hwe->eclass->sched_props.timeslice_us;
        q->sched_props.preempt_timeout_us =
                                hwe->eclass->sched_props.preempt_timeout_us;
+       q->sched_props.job_timeout_ms =
+                               hwe->eclass->sched_props.job_timeout_ms;
        if (q->flags & EXEC_QUEUE_FLAG_KERNEL &&
            q->flags & EXEC_QUEUE_FLAG_HIGH_PRIORITY)
                q->sched_props.priority = XE_EXEC_QUEUE_PRIORITY_KERNEL;

diff --git a/drivers/gpu/drm/xe/xe_exec_queue_types.h b/drivers/gpu/drm/xe/xe_exec_queue_types.h
index 36f4901d8d7ee917215d745da900ea49b7616a78..747106584f75271b8eb1e4b48653d5716239a722 100644 (file)
--- a/drivers/gpu/drm/xe/xe_exec_queue_types.h
+++ b/drivers/gpu/drm/xe/xe_exec_queue_types.h
@@ -132,6 +132,8 @@ struct xe_exec_queue {
                u32 timeslice_us;
                /** @preempt_timeout_us: preemption timeout in micro-seconds */
                u32 preempt_timeout_us;
+               /** @job_timeout_ms: job timeout in milliseconds */
+               u32 job_timeout_ms;
                /** @priority: priority of this exec queue */
                enum xe_exec_queue_priority priority;
        } sched_props;

diff --git a/drivers/gpu/drm/xe/xe_guc_submit.c b/drivers/gpu/drm/xe/xe_guc_submit.c
index f22ae717b0b2d3d8ff938d83f9ea954b4d5746e4..9d5e3afef505771e9733a043481fa5ace759f079 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1216,7 +1216,7 @@ static int guc_exec_queue_init(struct xe_exec_queue *q)
        init_waitqueue_head(&ge->suspend_wait);
 
        timeout = (q->vm && xe_vm_in_lr_mode(q->vm)) ? MAX_SCHEDULE_TIMEOUT :
-                 q->hwe->eclass->sched_props.job_timeout_ms;
+                 q->sched_props.job_timeout_ms;
        err = xe_sched_init(&ge->sched, &drm_sched_ops, &xe_sched_ops,
                            get_submit_wq(guc),
                            q->lrc[0].ring.size / MAX_JOB_SIZE_BYTES, 64,