drm/radeon: update radeon_atombios_get_default_voltages for mvdd

Add a way to look up the bootup mvdd.  Required for DPM on SI.

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

5 files changed, 14 insertions, 11 deletions

diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index 21c064badaa2..86f98db4716d 100644
--- a/drivers/gpu/drm/radeon/ni_dpm.c
+++ b/drivers/gpu/drm/radeon/ni_dpm.c
@@ -3800,8 +3800,8 @@ static void ni_parse_pplib_clock_info(struct radeon_device *rdev,
 
         /* patch up boot state */
         if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT) {
-                u16 vddc, vddci;
-                radeon_atombios_get_default_voltages(rdev, &vddc, &vddci);
+                u16 vddc, vddci, mvdd;
+                radeon_atombios_get_default_voltages(rdev, &vddc, &vddci, &mvdd);
                 pl->mclk = rdev->clock.default_mclk;
                 pl->sclk = rdev->clock.default_sclk;
                 pl->vddc = vddc;
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
 }
 
 void radeon_atombios_get_default_voltages(struct radeon_device *rdev,
-                                          u16 *vddc, u16 *vddci)
+                                          u16 *vddc, u16 *vddci, u16 *mvdd)
 {
         struct radeon_mode_info *mode_info = &rdev->mode_info;
         int index = GetIndexIntoMasterTable(DATA, FirmwareInfo);
@@ -2280,6 +2280,7 @@ void radeon_atombios_get_default_voltages(struct radeon_device *rdev,
 
         *vddc = 0;
         *vddci = 0;
+        *mvdd = 0;
 
         if (atom_parse_data_header(mode_info->atom_context, index, NULL,
                                    &frev, &crev, &data_offset)) {
@@ -2287,8 +2288,10 @@ void radeon_atombios_get_default_voltages(struct radeon_device *rdev,
                         (union firmware_info *)(mode_info->atom_context->bios +
                                                 data_offset);
                 *vddc = le16_to_cpu(firmware_info->info_14.usBootUpVDDCVoltage);
-                if ((frev == 2) && (crev >= 2))
+                if ((frev == 2) && (crev >= 2)) {
                         *vddci = le16_to_cpu(firmware_info->info_22.usBootUpVDDCIVoltage);
+                        *mvdd = le16_to_cpu(firmware_info->info_22.usBootUpMVDDCVoltage);
+                }
         }
 }
 
@@ -2299,9 +2302,9 @@ static void radeon_atombios_parse_pplib_non_clock_info(struct radeon_device *rde
         int j;
         u32 misc = le32_to_cpu(non_clock_info->ulCapsAndSettings);
         u32 misc2 = le16_to_cpu(non_clock_info->usClassification);
-        u16 vddc, vddci;
+        u16 vddc, vddci, mvdd;
 
-        radeon_atombios_get_default_voltages(rdev, &vddc, &vddci);
+        radeon_atombios_get_default_voltages(rdev, &vddc, &vddci, &mvdd);
 
         rdev->pm.power_state[state_index].misc = misc;
         rdev->pm.power_state[state_index].misc2 = misc2;
diff --git a/drivers/gpu/drm/radeon/radeon_mode.h b/drivers/gpu/drm/radeon/radeon_mode.h
index 0a4b50fa9c59..b568cb19a7fa 100644
--- a/drivers/gpu/drm/radeon/radeon_mode.h
+++ b/drivers/gpu/drm/radeon/radeon_mode.h
@@ -610,7 +610,7 @@ radeon_combios_get_tv_info(struct radeon_device *rdev);
 extern enum radeon_tv_std
 radeon_atombios_get_tv_info(struct radeon_device *rdev);
 extern void radeon_atombios_get_default_voltages(struct radeon_device *rdev,
-                                                 u16 *vddc, u16 *vddci);
+                                                 u16 *vddc, u16 *vddci, u16 *mvdd);
 
 extern struct drm_connector *
 radeon_get_connector_for_encoder(struct drm_encoder *encoder);
diff --git a/drivers/gpu/drm/radeon/rv6xx_dpm.c b/drivers/gpu/drm/radeon/rv6xx_dpm.c
index cc2a7c2477e7..2beb3d7cf77a 100644
--- a/drivers/gpu/drm/radeon/rv6xx_dpm.c
+++ b/drivers/gpu/drm/radeon/rv6xx_dpm.c
@@ -1821,8 +1821,8 @@ static void rv6xx_parse_pplib_clock_info(struct radeon_device *rdev,
 
         /* patch up boot state */
         if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT) {
-                u16 vddc, vddci;
-                radeon_atombios_get_default_voltages(rdev, &vddc, &vddci);
+                u16 vddc, vddci, mvdd;
+                radeon_atombios_get_default_voltages(rdev, &vddc, &vddci, &mvdd);
                 pl->mclk = rdev->clock.default_mclk;
                 pl->sclk = rdev->clock.default_sclk;
                 pl->vddc = vddc;
diff --git a/drivers/gpu/drm/radeon/rv770_dpm.c b/drivers/gpu/drm/radeon/rv770_dpm.c
index aa387647a7dd..2039802e8829 100644
--- a/drivers/gpu/drm/radeon/rv770_dpm.c
+++ b/drivers/gpu/drm/radeon/rv770_dpm.c
@@ -2175,8 +2175,8 @@ static void rv7xx_parse_pplib_clock_info(struct radeon_device *rdev,
 
         /* patch up boot state */
         if (rps->class & ATOM_PPLIB_CLASSIFICATION_BOOT) {
-                u16 vddc, vddci;
-                radeon_atombios_get_default_voltages(rdev, &vddc, &vddci);
+                u16 vddc, vddci, mvdd;
+                radeon_atombios_get_default_voltages(rdev, &vddc, &vddci, &mvdd);
                 pl->mclk = rdev->clock.default_mclk;
                 pl->sclk = rdev->clock.default_sclk;
                 pl->vddc = vddc;