drm/sched: Fix compilation issues with DRM priority rename

Fix compilation issues with DRM scheduler priority rename MIN to LOW.

Signed-off-by: Luben Tuikov <ltuikov89@gmail.com>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202311252109.WgbJsSkG-lkp@intel.com/
Cc: Danilo Krummrich <dakr@redhat.com>
Cc: Frank Binns <frank.binns@imgtec.com>
Cc: Donald Robson <donald.robson@imgtec.com>
Cc: Matt Coster <matt.coster@imgtec.com>
Cc: Direct Rendering Infrastructure - Development <dri-devel@lists.freedesktop.org>
Fixes: fe375c74806dbd ("drm/sched: Rename priority MIN to LOW")
Fixes: 38f922a563aac3 ("drm/sched: Reverse run-queue priority enumeration")
Fixes: 5f03a507b29e44 ("drm/nouveau: implement 1:1 scheduler - entity relationship")
Link: https://patchwork.freedesktop.org/patch/msgid/20231125192246.87268-2-ltuikov89@gmail.com
Reviewed-by: Christian König <christian.koenig@amd.com>
Link: https://lore.kernel.org/r/7429262c-6dea-4dcc-bf7e-54d2277dabf1@amd.com

diff --git a/drivers/gpu/drm/imagination/pvr_queue.c b/drivers/gpu/drm/imagination/pvr_queue.c
index d65c3fbedf5ac4efbf70aabf38972dcc9c310efd..5ed9c98fb599c8a66e959272db89d2b17ab314b4 100644 (file)
--- a/drivers/gpu/drm/imagination/pvr_queue.c
+++ b/drivers/gpu/drm/imagination/pvr_queue.c
@@ -1292,7 +1292,7 @@ struct pvr_queue *pvr_queue_create(struct pvr_context *ctx,
                goto err_release_ufo;
 
        err = drm_sched_entity_init(&queue->entity,
-                                   DRM_SCHED_PRIORITY_MIN,
+                                   DRM_SCHED_PRIORITY_KERNEL,
                                    &sched, 1, &ctx->faulty);
        if (err)
                goto err_sched_fini;

diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c
index 3393647bd944239a46b74db71885fe68d57b784d..dd98f6910f9cab7b19117186339a138277e77b78 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_sched.c
+++ b/drivers/gpu/drm/nouveau/nouveau_sched.c
@@ -18,7 +18,7 @@
  * index to the run-queue array.
  */
 enum nouveau_sched_priority {
-       NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_MIN,
+       NOUVEAU_SCHED_PRIORITY_SINGLE = DRM_SCHED_PRIORITY_KERNEL,
        NOUVEAU_SCHED_PRIORITY_COUNT,
 };
 
@@ -423,7 +423,7 @@ nouveau_sched_init(struct nouveau_sched *sched, struct nouveau_drm *drm,
        if (ret)
                goto fail_wq;
 
-       /* Using DRM_SCHED_PRIORITY_MIN, since that's what we're required to use
+       /* Using DRM_SCHED_PRIORITY_KERNEL, since that's what we're required to use
         * when we want to have a single run-queue only.
         *
         * It's not documented, but one will find out when trying to use any
@@ -433,7 +433,7 @@ nouveau_sched_init(struct nouveau_sched *sched, struct nouveau_drm *drm,
         * Can't use NOUVEAU_SCHED_PRIORITY_SINGLE either, because it's not
         * matching the enum type used in drm_sched_entity_init().
         */
-       ret = drm_sched_entity_init(entity, DRM_SCHED_PRIORITY_MIN,
+       ret = drm_sched_entity_init(entity, DRM_SCHED_PRIORITY_KERNEL,
                                    &drm_sched, 1, NULL);
        if (ret)
                goto fail_sched;