From: YiPeng Chai Date: Wed, 5 Nov 2025 09:25:37 +0000 (+0800) Subject: drm/amd/ras: Fix the issue of incorrect function call X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=be031770bfc1662e773e2dfc696f1a0c1401f300;p=thirdparty%2Fkernel%2Flinux.git drm/amd/ras: Fix the issue of incorrect function call When amdgpu_device_health_check fails, amdgpu_ras_pre_reset will not be called and therefore amdgpu_ras_post_reset cannot be called either. Signed-off-by: YiPeng Chai Reviewed-by: Hawking Zhang 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 dcf6fce1c5a23..86255c13fbb79 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c @@ -6694,8 +6694,8 @@ skip_sched_resume: amdgpu_device_gpu_resume(adev, &device_list, need_emergency_restart); reset_unlock: amdgpu_device_recovery_put_reset_lock(adev, &device_list); -end_reset: amdgpu_ras_post_reset(adev, &device_list); +end_reset: if (hive) { mutex_unlock(&hive->hive_lock); amdgpu_put_xgmi_hive(hive);