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 <YiPeng.Chai@amd.com>
Reviewed-by: Hawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
index dcf6fce1c5a2365aa7a7c06b42175f97845d596c..86255c13fbb79295b8896a4841cfea1117a03f21 100644 (file)
--- 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);