Remove unnecessary variable and simplify the logic.
Signed-off-by: Tao Zhou <tao.zhou1@xxxxxxx>
---
drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 14 +++-----------
1 file changed, 3 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
index 76cd095f96b6..f98e7b1aa96f 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c
@@ -2743,20 +2743,11 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
enum amdgpu_memory_partition nps = AMDGPU_NPS1_PARTITION_MODE;
int ret = 0;
uint32_t i, j, loop_cnt = 1;
- bool is_mca_add = true, find_pages_per_pa = false;
+ bool find_pages_per_pa = false;
if (!con || !con->eh_data || !bps || pages <= 0)
return 0;
- if (!adev->umc.ras || !adev->umc.ras->convert_ras_err_addr) {
- is_mca_add = false;
- } else {
- if ((pages > 1) &&
- (bps[0].address == bps[1].address) &&
- (bps[0].mem_channel == bps[1].mem_channel))
- is_mca_add = false;
- }
-
if (from_rom) {
err_data.err_addr =
kcalloc(adev->umc.retire_unit,
@@ -2780,7 +2771,8 @@ int amdgpu_ras_add_bad_pages(struct amdgpu_device *adev,
goto free;
for (i = 0; i < pages; i++) {
- if (is_mca_add) {
+ if (from_rom &&
+ control->rec_type == AMDGPU_RAS_EEPROM_REC_MCA) {
if (!find_pages_per_pa) {
if (amdgpu_ras_mca2pa_by_idx(adev, &bps[i], &err_data)) {
if (!i && nps == AMDGPU_NPS1_PARTITION_MODE) {
--
2.34.1
