lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/radeon: gcc fixes for ni dpm

Browse Source 
Newer versions of gcc seem to wander off into the
weeds when dealing with variable sizes arrays in
structs.  Rather than indexing the arrays, use
pointer arithmetic.

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:
Alex Deucher
2013-08-20 19:04:02 -04:00
parent 5e250d20c2
commit 1e05c4d918
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/gpu/drm/radeon/ni_dpm.c
View File

@@ -4038,6 +4038,7 @@ static int ni_parse_power_table(struct radeon_device *rdev)
(power_state->v1.ucNonClockStateIndex * (power_state->v1.ucNonClockStateIndex *
power_info->pplib.ucNonClockSize)); power_info->pplib.ucNonClockSize));
if (power_info->pplib.ucStateEntrySize - 1) { if (power_info->pplib.ucStateEntrySize - 1) {
u8 *idx;
ps = kzalloc(sizeof(struct ni_ps), GFP_KERNEL); ps = kzalloc(sizeof(struct ni_ps), GFP_KERNEL);
if (ps == NULL) { if (ps == NULL) {
kfree(rdev->pm.dpm.ps); kfree(rdev->pm.dpm.ps);
@@ -4047,12 +4048,12 @@ static int ni_parse_power_table(struct radeon_device *rdev)
ni_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i], ni_parse_pplib_non_clock_info(rdev, &rdev->pm.dpm.ps[i],
non_clock_info, non_clock_info,
power_info->pplib.ucNonClockSize); power_info->pplib.ucNonClockSize);
idx = (u8 *)&power_state->v1.ucClockStateIndices[0];
for (j = 0; j < (power_info->pplib.ucStateEntrySize - 1); j++) { for (j = 0; j < (power_info->pplib.ucStateEntrySize - 1); j++) {
clock_info = (union pplib_clock_info *) clock_info = (union pplib_clock_info *)
(mode_info->atom_context->bios + data_offset + (mode_info->atom_context->bios + data_offset +
le16_to_cpu(power_info->pplib.usClockInfoArrayOffset) + le16_to_cpu(power_info->pplib.usClockInfoArrayOffset) +
(power_state->v1.ucClockStateIndices[j] * (idx[j] * power_info->pplib.ucClockInfoSize));
power_info->pplib.ucClockInfoSize));
ni_parse_pplib_clock_info(rdev, ni_parse_pplib_clock_info(rdev,
&rdev->pm.dpm.ps[i], j, &rdev->pm.dpm.ps[i], j,
clock_info); clock_info);