drm/xe: Add exec_queue.sched_props.job_timeout_ms

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>

diff --git a/drivers/gpu/drm/xe/xe_exec_queue.c b/drivers/gpu/drm/xe/xe_exec_queue.c
index cd2b9a8e51f561a23bab87c264bfd149436e4e64..4ff7e50112ca95fb18d7cc98010ae3bb6a99f4f9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_exec_queue.c
+++ b/drivers/gpu/drm/xe/xe_exec_queue.c
@@ -65,6 +65,8 @@ static struct xe_exec_queue *__xe_exec_queue_alloc(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 8d4b7feb8c306b8a406a46f74c5cad2a430bdef3..6041892d894e23dcaea35ec979a90adea07948f9 100644 (file)
--- a/drivers/gpu/drm/xe/xe_exec_queue_types.h
+++ b/drivers/gpu/drm/xe/xe_exec_queue_types.h
@@ -142,6 +142,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 54ffcfcdd41f9ce3c590f5814fcbe3d3535946ac..392cbde6295732a64068362745b18672bacfd3b3 100644 (file)
--- a/drivers/gpu/drm/xe/xe_guc_submit.c
+++ b/drivers/gpu/drm/xe/xe_guc_submit.c
@@ -1218,7 +1218,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,