The default power state does not always match the default clocks and voltage
for a particular card. The information in the firmware info table is correct
and should be used in preference to the info the default power state.
Signed-off-by: Alex Deucher <alexdeuc...@gmail.com>
---
drivers/gpu/drm/radeon/radeon_atombios.c | 25 ++++++++++++++++++++++++-
1 files changed, 24 insertions(+), 1 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c
b/drivers/gpu/drm/radeon/radeon_atombios.c
index f858be0..ebfe8fd 100644
--- a/drivers/gpu/drm/radeon/radeon_atombios.c
+++ b/drivers/gpu/drm/radeon/radeon_atombios.c
@@ -1746,9 +1746,22 @@ void radeon_atombios_get_power_modes(struct
radeon_device *rdev)
rdev->pm.power_state[state_index].misc2 = 0;
}
} else {
+ int fw_index = GetIndexIntoMasterTable(DATA,
FirmwareInfo);
+ uint8_t fw_frev, fw_crev;
+ uint16_t fw_data_offset, vddc = 0;
+ union firmware_info *firmware_info;
+ ATOM_PPLIB_THERMALCONTROLLER *controller =
&power_info->info_4.sThermalController;
+
+ if (atom_parse_data_header(mode_info->atom_context,
fw_index, NULL,
+ &fw_frev, &fw_crev,
&fw_data_offset)) {
+ firmware_info =
+ (union firmware_info
*)(mode_info->atom_context->bios +
+ fw_data_offset);
+ vddc =
firmware_info->info_14.usBootUpVDDCVoltage;
+ }
+
/* add the i2c bus for thermal/fan chip */
/* no support for internal controller yet */
- ATOM_PPLIB_THERMALCONTROLLER *controller =
&power_info->info_4.sThermalController;
if (controller->ucType > 0) {
if ((controller->ucType ==
ATOM_PP_THERMALCONTROLLER_RV6xx) ||
(controller->ucType ==
ATOM_PP_THERMALCONTROLLER_RV770) ||
@@ -1895,6 +1908,16 @@ void radeon_atombios_get_power_modes(struct
radeon_device *rdev)
rdev->pm.default_power_state_index = state_index;
rdev->pm.power_state[state_index].default_clock_mode =
&rdev->pm.power_state[state_index].clock_info[mode_index - 1];
+ /* patch the table values with
the default slck/mclk from firmware info */
+ for (j = 0; j < mode_index;
j++) {
+
rdev->pm.power_state[state_index].clock_info[j].mclk =
+
rdev->clock.default_mclk;
+
rdev->pm.power_state[state_index].clock_info[j].sclk =
+
rdev->clock.default_sclk;
+ if (vddc)
+
rdev->pm.power_state[state_index].clock_info[j].voltage.voltage =
+ vddc;
+ }
}
state_index++;
}
--
1.5.6.3
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
