drm/amdgpu/userq: rename eviction helpers

suspend/resume -> evict/restore

Rename to avoid confusion with the system suspend
and resume helpers.

v2: update error messages

Reviewed-by: Prike Liang <Prike.Liang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c
index 0075469550b06abf03c5d1c2bc0e882fb47f4545..02164bca51a7dc9786a2fd1898255324cdb56454 100644 (file)
--- 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 b75b93e69c09aa079b845ac48cd01ed25290ec6e..82741dcb2a458360726f4c3877971c34a327717c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userqueue.c
@@ -528,7 +528,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;
@@ -659,7 +659,7 @@ unlock_all:
        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);
@@ -675,9 +675,9 @@ 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");
+               DRM_ERROR("Failed to restore all queues\n");
                goto unlock;
        }
 
@@ -686,7 +686,7 @@ unlock:
 }
 
 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);
@@ -738,11 +738,11 @@ amdgpu_userqueue_suspend(struct amdgpu_userq_mgr *uq_mgr,
        /* Wait for any pending userqueue fence work to finish */
        ret = amdgpu_userqueue_wait_for_signal(uq_mgr);
        if (ret) {
-               DRM_ERROR("Not suspending userqueue, timeout waiting for work\n");
+               DRM_ERROR("Not evicting userqueue, timeout waiting for work\n");
                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 8f392a0947a29832a1564d7c30a425c47b570b3b..a9f0e46bcec052c3658ef5fb809c51bf159b1057 100644 (file)
--- 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);