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

This reverts commit 9c44ff055965f2f75eee2ac95a7692600cf026a8.

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-9-tvrtko.ursulin@igalia.com

diff --git a/drivers/gpu/drm/msm/msm_gem_vma.c b/drivers/gpu/drm/msm/msm_gem_vma.c
index 3ed05ab0eeefdcaa7224e1298931f1b45978be61..c4cfe036066b75079a24885f4395158f22234405 100644 (file)
--- a/drivers/gpu/drm/msm/msm_gem_vma.c
+++ b/drivers/gpu/drm/msm/msm_gem_vma.c
@@ -841,6 +841,7 @@ msm_gem_vm_create(struct drm_device *drm, struct msm_mmu *mmu, const char *name,
        if (!managed) {
                struct drm_sched_init_args args = {
                        .ops = &msm_vm_bind_ops,
+                       .num_rqs = 1,
                        .credit_limit = 1,
                        .timeout = MAX_SCHEDULE_TIMEOUT,
                        .name = "msm-vm-bind",

diff --git a/drivers/gpu/drm/msm/msm_ringbuffer.c b/drivers/gpu/drm/msm/msm_ringbuffer.c
index 0d14c31bd4e47acef8a77aab43349c094da3fff8..2d6b930b766ecfdfbae225dc648cd245bcfe90b1 100644 (file)
--- a/drivers/gpu/drm/msm/msm_ringbuffer.c
+++ b/drivers/gpu/drm/msm/msm_ringbuffer.c
@@ -67,6 +67,7 @@ struct msm_ringbuffer *msm_ringbuffer_new(struct msm_gpu *gpu, int id,
 {
        struct drm_sched_init_args args = {
                .ops = &msm_sched_ops,
+               .num_rqs = DRM_SCHED_PRIORITY_COUNT,
                .credit_limit = num_hw_submissions,
                .timeout = MAX_SCHEDULE_TIMEOUT,
                .dev = gpu->dev->dev,