]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/amdgpu/userq: dont need check for return values in amdgpu_userq_evict
authorSunil Khatri <sunil.khatri@amd.com>
Tue, 31 Mar 2026 12:44:57 +0000 (18:14 +0530)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 3 Apr 2026 17:56:15 +0000 (13:56 -0400)
Function of amdgpu_userq_evict function do not need to check
for return values as we dont use them and no need to log errors
as we are already logging in called functions.

Signed-off-by: Sunil Khatri <sunil.khatri@amd.com>
Reviewed-by: Christian König <christian.koenig@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c

index 366728ed03e3e5d9bf115be8771a686b3e0bb958..744095d42fd0bd46695d9fe341cc87dc70c438e8 100644 (file)
@@ -1258,7 +1258,8 @@ amdgpu_userq_evict_all(struct amdgpu_userq_mgr *uq_mgr)
        }
 
        if (ret)
-               drm_file_err(uq_mgr->file, "Couldn't unmap all the queues\n");
+               drm_file_err(uq_mgr->file,
+                            "Couldn't unmap all the queues, eviction failed ret=%d\n", ret);
        return ret;
 }
 
@@ -1307,18 +1308,9 @@ amdgpu_userq_wait_for_signal(struct amdgpu_userq_mgr *uq_mgr)
 void
 amdgpu_userq_evict(struct amdgpu_userq_mgr *uq_mgr)
 {
-       struct amdgpu_device *adev = uq_mgr->adev;
-       int ret;
-
        /* Wait for any pending userqueue fence work to finish */
-       ret = amdgpu_userq_wait_for_signal(uq_mgr);
-       if (ret)
-               dev_err(adev->dev, "Not evicting userqueue, timeout waiting for work\n");
-
-       ret = amdgpu_userq_evict_all(uq_mgr);
-       if (ret)
-               dev_err(adev->dev, "Failed to evict userqueue\n");
-
+       amdgpu_userq_wait_for_signal(uq_mgr);
+       amdgpu_userq_evict_all(uq_mgr);
 }
 
 int amdgpu_userq_mgr_init(struct amdgpu_userq_mgr *userq_mgr, struct drm_file *file_priv,