drm/amdgpu: fix the calculation of RAS bad page number

__amdgpu_ras_restore_bad_pages is responsible for the maintenance of bad
page number, drop the unnecessary bad page number update in the error
handling path of add_bad_pages.

Signed-off-by: Tao Zhou <tao.zhou1@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_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 2a6cf7963dde228918d3e6f31af658151cdc8d54..d79b41ce21240500538ca4208857445ef7bbf67e 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -3249,8 +3249,6 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
                                                /* deal with retire_unit records a time */
                                                ret = __amdgpu_ras_convert_rec_array_from_rom(adev,
                                                                                &bps[i], &err_data, nps);
-                                               if (ret)
-                                                       con->bad_page_num -= adev->umc.retire_unit;
                                                i += (adev->umc.retire_unit - 1);
                                        } else {
                                                break;
@@ -3263,8 +3261,6 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
                for (; i < pages; i++) {
                        ret = __amdgpu_ras_convert_rec_from_rom(adev,
                                &bps[i], &err_data, nps);
-                       if (ret)
-                               con->bad_page_num -= adev->umc.retire_unit;
                }
 
                con->eh_data->count_saved = con->eh_data->count;