Revert "drm/xe: Remove drm_sched_init_args->num_rqs usage"

This reverts commit 4ca491d6ccf2daea813e67ed4b42e7b272f0687d.

Signed-off-by: Tvrtko Ursulin <tvrtko.ursulin@igalia.com>
Cc: Luke.Wildhardt@proton.me
Cc: Matthew Brost <matthew.brost@intel.com>
Cc: Danilo Krummrich <dakr@kernel.org>
Cc: Philipp Stanner <phasta@kernel.org>
Cc: Christian König <ckoenig.leichtzumerken@gmail.com>
Signed-off-by: Tvrtko Ursulin <tursulin@ursulin.net>
Link: https://lore.kernel.org/r/20260811163139.99746-3-tvrtko.ursulin@igalia.com

diff --git a/drivers/gpu/drm/xe/xe_dep_scheduler.c b/drivers/gpu/drm/xe/xe_dep_scheduler.c
index 004aac8b89e6ab2a0ef5db471c9c87aaaad2f367..51d99fee9aa5037a92316b8dcc9883590fe1b465 100644 (file)
--- a/drivers/gpu/drm/xe/xe_dep_scheduler.c
+++ b/drivers/gpu/drm/xe/xe_dep_scheduler.c
@@ -78,6 +78,7 @@ xe_dep_scheduler_create(struct xe_device *xe,
        const struct drm_sched_init_args args = {
                .ops = &sched_ops,
                .submit_wq = submit_wq,
+               .num_rqs = 1,
                .credit_limit = job_limit,
                .timeout = MAX_SCHEDULE_TIMEOUT,
                .name = name,

diff --git a/drivers/gpu/drm/xe/xe_execlist.c b/drivers/gpu/drm/xe/xe_execlist.c
index 9fb99c038ea8848faaf839db9cce85913ed24060..0fe4fb226ef47d71e4484a90ef91f60c31c969cf 100644 (file)
--- a/drivers/gpu/drm/xe/xe_execlist.c
+++ b/drivers/gpu/drm/xe/xe_execlist.c
@@ -328,6 +328,7 @@ static int execlist_exec_queue_init(struct xe_exec_queue *q)
        struct drm_gpu_scheduler *sched;
        const struct drm_sched_init_args args = {
                .ops = &drm_sched_ops,
+               .num_rqs = 1,
                .credit_limit = xe_lrc_ring_size() / MAX_JOB_SIZE_BYTES,
                .hang_limit = XE_SCHED_HANG_LIMIT,
                .timeout = XE_SCHED_JOB_TIMEOUT,

diff --git a/drivers/gpu/drm/xe/xe_gpu_scheduler.c b/drivers/gpu/drm/xe/xe_gpu_scheduler.c
index 67d8ce36848696411af26ec59a545169daa583b9..9c8004d5dd915f7f56473fb5b7570d51baf30f94 100644 (file)
--- a/drivers/gpu/drm/xe/xe_gpu_scheduler.c
+++ b/drivers/gpu/drm/xe/xe_gpu_scheduler.c
@@ -66,6 +66,7 @@ int xe_sched_init(struct xe_gpu_scheduler *sched,
        const struct drm_sched_init_args args = {
                .ops = ops,
                .submit_wq = submit_wq,
+               .num_rqs = 1,
                .credit_limit = hw_submission,
                .hang_limit = hang_limit,
                .timeout = timeout,