[PATCH 6/7] drm/amdgpu/userq: rename eviction helpers

[Liang, Prike]

[Public]

> -----Original Message-----
> From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Alex
> Deucher
> Sent: Thursday, April 17, 2025 6:21 AM
> To: amd-gfx at lists.freedesktop.org
> Cc: Deucher, Alexander <Alexander.Deucher at amd.com>
> Subject: [PATCH 6/7] drm/amdgpu/userq: rename eviction helpers
>
> suspend/resume -> evict/restore
>
> Rename to avoid confusion with the system suspend and resume helpers.
>
> Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
> ---
>  .../gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c   |  2 +-
>  drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c    | 16 ++++++++--------
>  drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h    |  4 ++--
>  3 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
> index 0075469550b06..02164bca51a7d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
> @@ -112,7 +112,7 @@ amdgpu_eviction_fence_suspend_worker(struct
> work_struct *work)
>       if (!ev_fence)
>               goto unlock;
>
> -     amdgpu_userqueue_suspend(uq_mgr, ev_fence);
> +     amdgpu_userqueue_evict(uq_mgr, ev_fence);
>
>  unlock:
>       mutex_unlock(&uq_mgr->userq_mutex);
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> index a2b92b549c0f9..c7b215337d55a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
> @@ -529,7 +529,7 @@ int amdgpu_userq_ioctl(struct drm_device *dev, void
> *data,  #endif
>
>  static int
> -amdgpu_userqueue_resume_all(struct amdgpu_userq_mgr *uq_mgr)
> +amdgpu_userqueue_restore_all(struct amdgpu_userq_mgr *uq_mgr)
>  {
>       struct amdgpu_device *adev = uq_mgr->adev;
>       struct amdgpu_usermode_queue *queue;
> @@ -660,7 +660,7 @@ amdgpu_userqueue_validate_bos(struct
> amdgpu_userq_mgr *uq_mgr)
>       return ret;
>  }
>
> -static void amdgpu_userqueue_resume_worker(struct work_struct *work)
> +static void amdgpu_userqueue_restore_worker(struct work_struct *work)
>  {
>       struct amdgpu_userq_mgr *uq_mgr = work_to_uq_mgr(work,
> resume_work.work);
>       struct amdgpu_fpriv *fpriv = uq_mgr_to_fpriv(uq_mgr); @@ -676,7 +676,7
> @@ static void amdgpu_userqueue_resume_worker(struct work_struct *work)
>               goto unlock;
>       }
>
> -     ret = amdgpu_userqueue_resume_all(uq_mgr);
> +     ret = amdgpu_userqueue_restore_all(uq_mgr);
>       if (ret) {
>               DRM_ERROR("Failed to resume all queues\n");

Please update error output information as well.
With that, the patch is Reviewed-by: Prike Liang <Prike.Liang at amd.com>


>               goto unlock;
> @@ -687,7 +687,7 @@ static void amdgpu_userqueue_resume_worker(struct
> work_struct *work)  }
>
>  static int
> -amdgpu_userqueue_suspend_all(struct amdgpu_userq_mgr *uq_mgr)
> +amdgpu_userqueue_evict_all(struct amdgpu_userq_mgr *uq_mgr)
>  {
>       struct amdgpu_device *adev = uq_mgr->adev;
>       struct amdgpu_usermode_queue *queue;
> @@ -728,8 +728,8 @@ amdgpu_userqueue_wait_for_signal(struct
> amdgpu_userq_mgr *uq_mgr)  }
>
>  void
> -amdgpu_userqueue_suspend(struct amdgpu_userq_mgr *uq_mgr,
> -                      struct amdgpu_eviction_fence *ev_fence)
> +amdgpu_userqueue_evict(struct amdgpu_userq_mgr *uq_mgr,
> +                    struct amdgpu_eviction_fence *ev_fence)
>  {
>       int ret;
>       struct amdgpu_fpriv *fpriv = uq_mgr_to_fpriv(uq_mgr); @@ -742,7 +742,7
> @@ amdgpu_userqueue_suspend(struct amdgpu_userq_mgr *uq_mgr,
>               return;
>       }
>
> -     ret = amdgpu_userqueue_suspend_all(uq_mgr);
> +     ret = amdgpu_userqueue_evict_all(uq_mgr);
>       if (ret) {
>               DRM_ERROR("Failed to evict userqueue\n");
>               return;
> @@ -770,7 +770,7 @@ int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr
> *userq_mgr, struct amdgpu_devi
>       list_add(&userq_mgr->list, &adev->userq_mgr_list);
>       mutex_unlock(&adev->userq_mutex);
>
> -     INIT_DELAYED_WORK(&userq_mgr->resume_work,
> amdgpu_userqueue_resume_worker);
> +     INIT_DELAYED_WORK(&userq_mgr->resume_work,
> +amdgpu_userqueue_restore_worker);
>       return 0;
>  }
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
> b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
> index 8f392a0947a29..a9f0e46bcec05 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.h
> @@ -108,8 +108,8 @@ int amdgpu_userqueue_create_object(struct
> amdgpu_userq_mgr *uq_mgr,  void amdgpu_userqueue_destroy_object(struct
> amdgpu_userq_mgr *uq_mgr,
>                                    struct amdgpu_userq_obj *userq_obj);
>
> -void amdgpu_userqueue_suspend(struct amdgpu_userq_mgr *uq_mgr,
> -                           struct amdgpu_eviction_fence *ev_fence);
> +void amdgpu_userqueue_evict(struct amdgpu_userq_mgr *uq_mgr,
> +                         struct amdgpu_eviction_fence *ev_fence);
>
>  int amdgpu_userqueue_active(struct amdgpu_userq_mgr *uq_mgr);
>
> --
> 2.49.0