Re: [Patch v5 2/5] drm/amdgpu/userq: dont need check for return values in amdgpu_userq_evict

[Khatri, Sunil]

On 01-04-2026 06:57 pm, Christian König wrote:

On 3/31/26 15:46, Sunil Khatri wrote:

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.kha...@amd.com>
---
  drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 16 ++++------------
  1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
index a98118898832..1aeaa5662dda 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c
@@ -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;
  }

@@ -1298,18 +1299,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);

That confirms my suspicion that patch #1 would cause build failures when 
applied alone.

Please re-order the patch before pushing them so that this one here comes first.

Sure Christian.

Thanks Sunil

With that done Reviewed-by: Christian König <christian.koe...@amd.com>

Regards,
Christian.

-       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,