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>

diff --git a/drivers/gpu/drm/radeon/ni_dpm.c b/drivers/gpu/drm/radeon/ni_dpm.c
index 21c064badaa2de0f37d464b34df4a143e2b3288e..86f98db4716d378e67c96662e5878923f3446357 100644 (file)
--- 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 c707ed034713184475227358324b42e696c125ef..54b8e8c1f731816111af06b693623c9816a5f178 100644 (file)
--- 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 0a4b50fa9c595af02f63a0dea8bb9463fbc7fd77..b568cb19a7fa316faaa94ffa349b52f8564380ec 100644 (file)
--- 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 cc2a7c2477e780dc83ac991fed9b9060814207d3..2beb3d7cf77a8c4a1703343d52ed48f49ead5198 100644 (file)
--- 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 aa387647a7dd10e415f90dbb669c5be1767f2fa1..2039802e8829409f2e6d49407e019347ce9af5af 100644 (file)
--- 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;