Re: [PATCH] drm/sched: Fix compilation issues with DRM priority rename

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Luben,

thanks for the patch!

On Sat, 2023-11-25 at 14:22 -0500, Luben Tuikov wrote:
> Fix compilation issues with DRM scheduler priority rename MIN to LOW.
> 
> Signed-off-by: Luben Tuikov <ltuikov89@xxxxxxxxx>
> Reported-by: kernel test robot <lkp@xxxxxxxxx>
> Closes: https://lore.kernel.org/oe-kbuild-all/202311252109.WgbJsSkG-lkp@xxxxxxxxx/
> Cc: Danilo Krummrich <dakr@xxxxxxxxxx>
> Cc: Frank Binns <frank.binns@xxxxxxxxxx>
> Cc: Donald Robson <donald.robson@xxxxxxxxxx>
> Cc: Matt Coster <matt.coster@xxxxxxxxxx>
> Cc: Direct Rendering Infrastructure - Development <dri-devel@xxxxxxxxxxxxxxxxxxxxx>
> Fixes: fe375c74806dbd ("drm/sched: Rename priority MIN to LOW")
> Fixes: 5f03a507b29e44 ("drm/nouveau: implement 1:1 scheduler - entity relationship")
> ---
>  drivers/gpu/drm/imagination/pvr_queue.c | 2 +-
>  drivers/gpu/drm/nouveau/nouveau_sched.c | 6 +++---
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/imagination/pvr_queue.c b/drivers/gpu/drm/imagination/pvr_queue.c
> index d65c3fbedf5ac4..5ed9c98fb599c8 100644
> --- 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;

At least pvr_queue.c can be built again,

Tested-by: Alexander Sverdlin <alexander.sverdlin@xxxxxxxxxxx>

> diff --git a/drivers/gpu/drm/nouveau/nouveau_sched.c b/drivers/gpu/drm/nouveau/nouveau_sched.c
> index 3393647bd94423..dd98f6910f9cab 100644
> --- 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;

-- 
Alexander Sverdlin
Siemens AG
www.siemens.com




[Index of Archives]     [Linux DRI Users]     [Linux Intel Graphics]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]     [XFree86]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Linux Kernel]     [Linux SCSI]     [XFree86]
  Powered by Linux