Revert "drm/amdgpu: Add judgement to avoid infinite loop"
authoryipechai <YiPeng.Chai@amd.com>
Mon, 7 Feb 2022 03:28:28 +0000 (11:28 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 7 Feb 2022 23:00:05 +0000 (18:00 -0500)
The commit d5e8ff5f7b2a ("drm/amdgpu: Fixed the defect of soft lock caused by infinite loop")
had fixed this defect.

Revert workaround
commit a2170b4af62f ("drm/amdgpu: Add judgement to avoid infinite loop").

Signed-off-by: yipechai <YiPeng.Chai@amd.com>
Reviewed-by: Tao Zhou <tao.zhou1@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

index d6608ae3c127cf97baa2cea9ef2336a0b13a569f..5934326b9db39f3a6869bf3a9799c0f8e9baff73 100644 (file)
@@ -886,7 +886,6 @@ static int amdgpu_ras_block_match_default(struct amdgpu_ras_block_object *block_
 static struct amdgpu_ras_block_object *amdgpu_ras_get_ras_block(struct amdgpu_device *adev,
                                        enum amdgpu_ras_block block, uint32_t sub_block_index)
 {
-       int loop_cnt = 0;
        struct amdgpu_ras_block_list *node, *tmp;
        struct amdgpu_ras_block_object *obj;
 
@@ -910,9 +909,6 @@ static struct amdgpu_ras_block_object *amdgpu_ras_get_ras_block(struct amdgpu_de
                        if (amdgpu_ras_block_match_default(obj, block) == 0)
                                return obj;
                }
-
-               if (++loop_cnt >= AMDGPU_RAS_BLOCK__LAST)
-                       break;
        }
 
        return NULL;