]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/xe/guc_submit: use jiffies for job timeout
authorMatthew Auld <matthew.auld@intel.com>
Thu, 14 Mar 2024 12:15:55 +0000 (12:15 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 10 Apr 2024 14:37:55 +0000 (16:37 +0200)
[ Upstream commit 9c1256369c10e31b5ce6575e4ea27fe2c375fd94 ]

drm_sched_init() expects jiffies for the timeout, but here we are
passing the timeout in ms. Convert to jiffies instead.

Fixes: eef55700f302 ("drm/xe: Add sysfs for default engine scheduler properties")
Signed-off-by: Matthew Auld <matthew.auld@intel.com>
Cc: Matthew Brost <matthew.brost@intel.com>
Reviewed-by: Nirmoy Das <nirmoy.das@intel.com>
Reviewed-by: Matthew Brost <matthew.brost@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240314121554.223229-2-matthew.auld@intel.com
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
(cherry picked from commit 2c5b70f74d61438a071a19370e63c234d2bd8938)
Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/xe/xe_guc_submit.c

index 9d5e3afef505771e9733a043481fa5ace759f079..bd1079aa88498c5cc0fd43c2dec2841a7c455cfe 100644 (file)
@@ -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->sched_props.job_timeout_ms;
+                 msecs_to_jiffies(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,