drm/radeon/dpm/atom: fix broken gcc harder
See bugs: https://bugs.freedesktop.org/show_bug.cgi?id=66932 https://bugs.freedesktop.org/show_bug.cgi?id=66972 https://bugs.freedesktop.org/show_bug.cgi?id=66945 Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
48fa04c3fc
commit
f90555cbe6
|
@ -3699,18 +3699,21 @@ int radeon_atom_init_mc_reg_table(struct radeon_device *rdev,
|
||||||
(ATOM_MEMORY_SETTING_DATA_BLOCK *)
|
(ATOM_MEMORY_SETTING_DATA_BLOCK *)
|
||||||
((u8 *)reg_block + (2 * sizeof(u16)) +
|
((u8 *)reg_block + (2 * sizeof(u16)) +
|
||||||
le16_to_cpu(reg_block->usRegIndexTblSize));
|
le16_to_cpu(reg_block->usRegIndexTblSize));
|
||||||
|
ATOM_INIT_REG_INDEX_FORMAT *format = ®_block->asRegIndexBuf[0];
|
||||||
num_entries = (u8)((le16_to_cpu(reg_block->usRegIndexTblSize)) /
|
num_entries = (u8)((le16_to_cpu(reg_block->usRegIndexTblSize)) /
|
||||||
sizeof(ATOM_INIT_REG_INDEX_FORMAT)) - 1;
|
sizeof(ATOM_INIT_REG_INDEX_FORMAT)) - 1;
|
||||||
if (num_entries > VBIOS_MC_REGISTER_ARRAY_SIZE)
|
if (num_entries > VBIOS_MC_REGISTER_ARRAY_SIZE)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
while (i < num_entries) {
|
while (i < num_entries) {
|
||||||
if (reg_block->asRegIndexBuf[i].ucPreRegDataLength & ACCESS_PLACEHOLDER)
|
if (format->ucPreRegDataLength & ACCESS_PLACEHOLDER)
|
||||||
break;
|
break;
|
||||||
reg_table->mc_reg_address[i].s1 =
|
reg_table->mc_reg_address[i].s1 =
|
||||||
(u16)(le16_to_cpu(reg_block->asRegIndexBuf[i].usRegIndex));
|
(u16)(le16_to_cpu(format->usRegIndex));
|
||||||
reg_table->mc_reg_address[i].pre_reg_data =
|
reg_table->mc_reg_address[i].pre_reg_data =
|
||||||
(u8)(reg_block->asRegIndexBuf[i].ucPreRegDataLength);
|
(u8)(format->ucPreRegDataLength);
|
||||||
i++;
|
i++;
|
||||||
|
format = (ATOM_INIT_REG_INDEX_FORMAT *)
|
||||||
|
((u8 *)format + sizeof(ATOM_INIT_REG_INDEX_FORMAT));
|
||||||
}
|
}
|
||||||
reg_table->last = i;
|
reg_table->last = i;
|
||||||
while ((*(u32 *)reg_data != END_OF_REG_DATA_BLOCK) &&
|
while ((*(u32 *)reg_data != END_OF_REG_DATA_BLOCK) &&
|
||||||
|
|
Loading…
Reference in New Issue