[PATCH 3/3] drm/amdgpu: fix ACA no query result after gpu reset

[Yang Wang]

fix ACA no query result after gpu reset.

Signed-off-by: Yang Wang <kevinyang.w...@amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 7 -------
 drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 1 -
 drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 9 ++++-----
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
index 05062f2581a1..6c6c387e5a06 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c
@@ -712,13 +712,6 @@ void amdgpu_aca_fini(struct amdgpu_device *adev)
        atomic_set(&aca->ue_update_flag, 0);
 }
 
-int amdgpu_aca_reset(struct amdgpu_device *adev)
-{
-       amdgpu_aca_fini(adev);
-
-       return amdgpu_aca_init(adev);
-}
-
 void amdgpu_aca_set_smu_funcs(struct amdgpu_device *adev, const struct 
aca_smu_funcs *smu_funcs)
 {
        struct amdgpu_aca *aca = &adev->aca;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
index ba724c2a997d..4327ce1ceacf 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h
@@ -192,7 +192,6 @@ struct aca_info {
 
 int amdgpu_aca_init(struct amdgpu_device *adev);
 void amdgpu_aca_fini(struct amdgpu_device *adev);
-int amdgpu_aca_reset(struct amdgpu_device *adev);
 void amdgpu_aca_set_smu_funcs(struct amdgpu_device *adev, const struct 
aca_smu_funcs *smu_funcs);
 bool amdgpu_aca_is_enabled(struct amdgpu_device *adev);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c 
b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 06c5f6e2ef7c..5af813eacfb3 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3617,12 +3617,11 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev)
        amdgpu_ras_event_mgr_init(adev);
 
        if (amdgpu_aca_is_enabled(adev)) {
-               if (amdgpu_in_reset(adev))
-                       r = amdgpu_aca_reset(adev);
-                else
+               if (!amdgpu_in_reset(adev)) {
                        r = amdgpu_aca_init(adev);
-               if (r)
-                       return r;
+                       if (r)
+                               return r;
+               }
 
                if (!amdgpu_sriov_vf(adev))
                        amdgpu_ras_set_aca_debug_mode(adev, false);
-- 
2.34.1