From: Mario Limonciello Date: Thu, 2 Oct 2025 17:42:45 +0000 (-0500) Subject: drm/amd: Pass userq suspend failures up to caller X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1f3cca77943b6c8bfc7342722e2ce7b348484ee3;p=thirdparty%2Fkernel%2Flinux.git drm/amd: Pass userq suspend failures up to caller If a userq failed to suspend the rest of the suspend sequence may have problems. Pass the error code up to the caller for a decision on what to do. Reviewed-by: Alex Deucher Signed-off-by: Mario Limonciello Signed-off-by: Alex Deucher --- diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c index a734c05cc00e4..c7c999ae2a28f 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -5224,7 +5224,9 @@ int amdgpu_device_suspend(struct drm_device *dev, bool notify_clients) return r; amdgpu_amdkfd_suspend(adev, !amdgpu_sriov_vf(adev) && !adev->in_runpm); - amdgpu_userq_suspend(adev); + r = amdgpu_userq_suspend(adev); + if (r) + return r; r = amdgpu_device_evict_resources(adev); if (r)