drm/amdgpu: Remove all code paths under the EAGAIN path in RAS late init

All code paths under the EAGAIN path in RAS late init are unused.

Signed-off-by: Candice Li <candice.li@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 912ea1f9fd04c6a60c9253b81679d4875c267604..e1c34eef76b7c38916ab516367dab390c37a2542 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2131,19 +2131,6 @@ static int amdgpu_ras_recovery_fini(struct amdgpu_device *adev)
 }
 /* recovery end */
 
-/* return 0 if ras will reset gpu and repost.*/
-int amdgpu_ras_request_reset_on_boot(struct amdgpu_device *adev,
-               unsigned int block)
-{
-       struct amdgpu_ras *ras = amdgpu_ras_get_context(adev);
-
-       if (!ras)
-               return -EINVAL;
-
-       ras->flags |= AMDGPU_RAS_FLAG_INIT_NEED_RESET;
-       return 0;
-}
-
 static bool amdgpu_ras_asic_supported(struct amdgpu_device *adev)
 {
        return adev->asic_type == CHIP_VEGA10 ||
@@ -2382,12 +2369,7 @@ int amdgpu_ras_late_init(struct amdgpu_device *adev,
 
        r = amdgpu_ras_feature_enable_on_boot(adev, ras_block, 1);
        if (r) {
-               if (r == -EAGAIN) {
-                       /* request gpu reset. will run again */
-                       amdgpu_ras_request_reset_on_boot(adev,
-                                       ras_block->block);
-                       return 0;
-               } else if (adev->in_suspend || amdgpu_in_reset(adev)) {
+               if (adev->in_suspend || amdgpu_in_reset(adev)) {
                        /* in resume phase, if fail to enable ras,
                         * clean up all ras fs nodes, and disable ras */
                        goto cleanup;
@@ -2479,19 +2461,6 @@ void amdgpu_ras_resume(struct amdgpu_device *adev)
                        }
                }
        }
-
-       if (con->flags & AMDGPU_RAS_FLAG_INIT_NEED_RESET) {
-               con->flags &= ~AMDGPU_RAS_FLAG_INIT_NEED_RESET;
-               /* setup ras obj state as disabled.
-                * for init_by_vbios case.
-                * if we want to enable ras, just enable it in a normal way.
-                * If we want do disable it, need setup ras obj as enabled,
-                * then issue another TA disable cmd.
-                * See feature_enable_on_boot
-                */
-               amdgpu_ras_disable_all_features(adev, 1);
-               amdgpu_ras_reset_gpu(adev);
-       }
 }
 
 void amdgpu_ras_suspend(struct amdgpu_device *adev)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
index ec42e9873aaa9eee4c247d876e3a8b15b9946a0d..37b3c40272b4c34a20b5cb97a3377ae0dd5ad32c 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h
@@ -32,7 +32,6 @@
 #include "amdgpu_ras_eeprom.h"
 
 #define AMDGPU_RAS_FLAG_INIT_BY_VBIOS          (0x1 << 0)
-#define AMDGPU_RAS_FLAG_INIT_NEED_RESET                (0x1 << 1)
 
 enum amdgpu_ras_block {
        AMDGPU_RAS_BLOCK__UMC = 0,
@@ -495,8 +494,6 @@ static inline int amdgpu_ras_is_supported(struct amdgpu_device *adev,
 }
 
 int amdgpu_ras_recovery_init(struct amdgpu_device *adev);
-int amdgpu_ras_request_reset_on_boot(struct amdgpu_device *adev,
-               unsigned int block);
 
 void amdgpu_ras_resume(struct amdgpu_device *adev);
 void amdgpu_ras_suspend(struct amdgpu_device *adev);