diff options
author | Rex Zhu <Rex.Zhu@amd.com> | 2016-06-29 08:59:59 -0400 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-07-29 14:36:46 -0400 |
commit | c0bcc4ec07594a999c9e9efa1963d4493d90d2c7 (patch) | |
tree | 4fbf869a6905766ed2860cec5907d7b804ba46cf | |
parent | 649663cf6380fffdfdeb52ab2b276caa6bcb3e51 (diff) |
drm/amd/powerplay: populate SMC ACPI minimum voltage using VBIOS boot SCLK and MCLK
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c index d1b528b401e9..38258ef344d6 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | |||
@@ -1473,7 +1473,7 @@ static int polaris10_populate_smc_acpi_level(struct pp_hwmgr *hwmgr, | |||
1473 | 1473 | ||
1474 | /* Get MinVoltage and Frequency from DPM0, | 1474 | /* Get MinVoltage and Frequency from DPM0, |
1475 | * already converted to SMC_UL */ | 1475 | * already converted to SMC_UL */ |
1476 | sclk_frequency = data->dpm_table.sclk_table.dpm_levels[0].value; | 1476 | sclk_frequency = data->vbios_boot_state.sclk_bootup_value; |
1477 | result = polaris10_get_dependency_volt_by_clk(hwmgr, | 1477 | result = polaris10_get_dependency_volt_by_clk(hwmgr, |
1478 | table_info->vdd_dep_on_sclk, | 1478 | table_info->vdd_dep_on_sclk, |
1479 | sclk_frequency, | 1479 | sclk_frequency, |
@@ -1509,8 +1509,7 @@ static int polaris10_populate_smc_acpi_level(struct pp_hwmgr *hwmgr, | |||
1509 | 1509 | ||
1510 | 1510 | ||
1511 | /* Get MinVoltage and Frequency from DPM0, already converted to SMC_UL */ | 1511 | /* Get MinVoltage and Frequency from DPM0, already converted to SMC_UL */ |
1512 | table->MemoryACPILevel.MclkFrequency = | 1512 | table->MemoryACPILevel.MclkFrequency = data->vbios_boot_state.mclk_bootup_value; |
1513 | data->dpm_table.mclk_table.dpm_levels[0].value; | ||
1514 | result = polaris10_get_dependency_volt_by_clk(hwmgr, | 1513 | result = polaris10_get_dependency_volt_by_clk(hwmgr, |
1515 | table_info->vdd_dep_on_mclk, | 1514 | table_info->vdd_dep_on_mclk, |
1516 | table->MemoryACPILevel.MclkFrequency, | 1515 | table->MemoryACPILevel.MclkFrequency, |