Revert "drm/amdgpu: No longer insert ras blocks into ras_list if it already exists...
authoryipechai <YiPeng.Chai@amd.com>
Wed, 19 Jan 2022 08:49:42 +0000 (16:49 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Tue, 25 Jan 2022 23:00:34 +0000 (18:00 -0500)
This reverts commit df4f0041c6ef497e598a67e367db835489162754.

Xgmi ras initialization had been moved from .late_init to early_init,
the defect of repeated calling amdgpu_ras_register_ras_block had been
fixed, so revert this patch.

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 4992bc5..d4e07d0 100644 (file)
@@ -2763,19 +2763,12 @@ int amdgpu_ras_reset_gpu(struct amdgpu_device *adev)
 int amdgpu_ras_register_ras_block(struct amdgpu_device *adev,
                struct amdgpu_ras_block_object *ras_block_obj)
 {
-       struct amdgpu_ras_block_object *obj, *tmp;
        if (!adev || !ras_block_obj)
                return -EINVAL;
 
        if (!amdgpu_ras_asic_supported(adev))
                return 0;
 
-       /* If the ras object is in ras_list, don't add it again */
-       list_for_each_entry_safe(obj, tmp, &adev->ras_list, node) {
-               if (obj == ras_block_obj)
-                       return 0;
-       }
-
        INIT_LIST_HEAD(&ras_block_obj->node);
        list_add_tail(&ras_block_obj->node, &adev->ras_list);