1 files changed, 3 insertions, 7 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/si_dpm.c b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
index 51fd0c9a20a5..299cb3161b2c 100644
--- a/drivers/gpu/drm/amd/amdgpu/si_dpm.c
+++ b/drivers/gpu/drm/amd/amdgpu/si_dpm.c
@@ -5845,9 +5845,9 @@ static int si_set_mc_special_registers(struct amdgpu_device *adev,
                                         ((temp_reg & 0xffff0000)) |
                                         ((table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16);
                         j++;
+
                         if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
                                 return -EINVAL;
-
                         temp_reg = RREG32(MC_PMG_CMD_MRS);
                         table->mc_reg_address[j].s1 = MC_PMG_CMD_MRS;
                         table->mc_reg_address[j].s0 = MC_SEQ_PMG_CMD_MRS_LP;
@@ -5859,18 +5859,16 @@ static int si_set_mc_special_registers(struct amdgpu_device *adev,
                                         table->mc_reg_table_entry[k].mc_data[j] |= 0x100;
                         }
                         j++;
-                        if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
-                                return -EINVAL;
 
                         if (adev->mc.vram_type != AMDGPU_VRAM_TYPE_GDDR5) {
+                                if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
+                                        return -EINVAL;
                                 table->mc_reg_address[j].s1 = MC_PMG_AUTO_CMD;
                                 table->mc_reg_address[j].s0 = MC_PMG_AUTO_CMD;
                                 for (k = 0; k < table->num_entries; k++)
                                         table->mc_reg_table_entry[k].mc_data[j] =
                                                 (table->mc_reg_table_entry[k].mc_data[i] & 0xffff0000) >> 16;
                                 j++;
-                                if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
-                                        return -EINVAL;
                         }
                         break;
                 case MC_SEQ_RESERVE_M:
@@ -5882,8 +5880,6 @@ static int si_set_mc_special_registers(struct amdgpu_device *adev,
                                         (temp_reg & 0xffff0000) |
                                         (table->mc_reg_table_entry[k].mc_data[i] & 0x0000ffff);
                         j++;
-                        if (j >= SMC_SISLANDS_MC_REGISTER_ARRAY_SIZE)
-                                return -EINVAL;
                         break;
                 default:
                         break;