diff options
Diffstat (limited to 'drivers/gpu/drm/radeon/radeon_atombios.c')
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_atombios.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index c707ed034713..54b8e8c1f731 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c | |||
@@ -2270,7 +2270,7 @@ static void radeon_atombios_add_pplib_thermal_controller(struct radeon_device *r | |||
2270 | } | 2270 | } |
2271 | 2271 | ||
2272 | void radeon_atombios_get_default_voltages(struct radeon_device *rdev, | 2272 | void radeon_atombios_get_default_voltages(struct radeon_device *rdev, |
2273 | u16 *vddc, u16 *vddci) | 2273 | u16 *vddc, u16 *vddci, u16 *mvdd) |
2274 | { | 2274 | { |
2275 | struct radeon_mode_info *mode_info = &rdev->mode_info; | 2275 | struct radeon_mode_info *mode_info = &rdev->mode_info; |
2276 | int index = GetIndexIntoMasterTable(DATA, FirmwareInfo); | 2276 | int index = GetIndexIntoMasterTable(DATA, FirmwareInfo); |
@@ -2280,6 +2280,7 @@ void radeon_atombios_get_default_voltages(struct radeon_device *rdev, | |||
2280 | 2280 | ||
2281 | *vddc = 0; | 2281 | *vddc = 0; |
2282 | *vddci = 0; | 2282 | *vddci = 0; |
2283 | *mvdd = 0; | ||
2283 | 2284 | ||
2284 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, | 2285 | if (atom_parse_data_header(mode_info->atom_context, index, NULL, |
2285 | &frev, &crev, &data_offset)) { | 2286 | &frev, &crev, &data_offset)) { |
@@ -2287,8 +2288,10 @@ void radeon_atombios_get_default_voltages(struct radeon_device *rdev, | |||
2287 | (union firmware_info *)(mode_info->atom_context->bios + | 2288 | (union firmware_info *)(mode_info->atom_context->bios + |
2288 | data_offset); | 2289 | data_offset); |
2289 | *vddc = le16_to_cpu(firmware_info->info_14.usBootUpVDDCVoltage); | 2290 | *vddc = le16_to_cpu(firmware_info->info_14.usBootUpVDDCVoltage); |
2290 | if ((frev == 2) && (crev >= 2)) | 2291 | if ((frev == 2) && (crev >= 2)) { |
2291 | *vddci = le16_to_cpu(firmware_info->info_22.usBootUpVDDCIVoltage); | 2292 | *vddci = le16_to_cpu(firmware_info->info_22.usBootUpVDDCIVoltage); |
2293 | *mvdd = le16_to_cpu(firmware_info->info_22.usBootUpMVDDCVoltage); | ||
2294 | } | ||
2292 | } | 2295 | } |
2293 | } | 2296 | } |
2294 | 2297 | ||
@@ -2299,9 +2302,9 @@ static void radeon_atombios_parse_pplib_non_clock_info(struct radeon_device *rde | |||
2299 | int j; | 2302 | int j; |
2300 | u32 misc = le32_to_cpu(non_clock_info->ulCapsAndSettings); | 2303 | u32 misc = le32_to_cpu(non_clock_info->ulCapsAndSettings); |
2301 | u32 misc2 = le16_to_cpu(non_clock_info->usClassification); | 2304 | u32 misc2 = le16_to_cpu(non_clock_info->usClassification); |
2302 | u16 vddc, vddci; | 2305 | u16 vddc, vddci, mvdd; |
2303 | 2306 | ||
2304 | radeon_atombios_get_default_voltages(rdev, &vddc, &vddci); | 2307 | radeon_atombios_get_default_voltages(rdev, &vddc, &vddci, &mvdd); |
2305 | 2308 | ||
2306 | rdev->pm.power_state[state_index].misc = misc; | 2309 | rdev->pm.power_state[state_index].misc = misc; |
2307 | rdev->pm.power_state[state_index].misc2 = misc2; | 2310 | rdev->pm.power_state[state_index].misc2 = misc2; |