diff options
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c index c3e9acaa6690..2ab3bb25d175 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/polaris10_hwmgr.c | |||
@@ -1565,6 +1565,7 @@ static int polaris10_populate_smc_vce_level(struct pp_hwmgr *hwmgr, | |||
1565 | 1565 | ||
1566 | for (count = 0; count < table->VceLevelCount; count++) { | 1566 | for (count = 0; count < table->VceLevelCount; count++) { |
1567 | table->VceLevel[count].Frequency = mm_table->entries[count].eclk; | 1567 | table->VceLevel[count].Frequency = mm_table->entries[count].eclk; |
1568 | table->VceLevel[count].MinVoltage = 0; | ||
1568 | table->VceLevel[count].MinVoltage |= | 1569 | table->VceLevel[count].MinVoltage |= |
1569 | (mm_table->entries[count].vddc * VOLTAGE_SCALE) << VDDC_SHIFT; | 1570 | (mm_table->entries[count].vddc * VOLTAGE_SCALE) << VDDC_SHIFT; |
1570 | table->VceLevel[count].MinVoltage |= | 1571 | table->VceLevel[count].MinVoltage |= |
@@ -1604,6 +1605,7 @@ static int polaris10_populate_smc_samu_level(struct pp_hwmgr *hwmgr, | |||
1604 | 1605 | ||
1605 | for (count = 0; count < table->SamuLevelCount; count++) { | 1606 | for (count = 0; count < table->SamuLevelCount; count++) { |
1606 | /* not sure whether we need evclk or not */ | 1607 | /* not sure whether we need evclk or not */ |
1608 | table->SamuLevel[count].MinVoltage = 0; | ||
1607 | table->SamuLevel[count].Frequency = mm_table->entries[count].samclock; | 1609 | table->SamuLevel[count].Frequency = mm_table->entries[count].samclock; |
1608 | table->SamuLevel[count].MinVoltage |= (mm_table->entries[count].vddc * | 1610 | table->SamuLevel[count].MinVoltage |= (mm_table->entries[count].vddc * |
1609 | VOLTAGE_SCALE) << VDDC_SHIFT; | 1611 | VOLTAGE_SCALE) << VDDC_SHIFT; |
@@ -1696,6 +1698,7 @@ static int polaris10_populate_smc_uvd_level(struct pp_hwmgr *hwmgr, | |||
1696 | table->UvdBootLevel = 0; | 1698 | table->UvdBootLevel = 0; |
1697 | 1699 | ||
1698 | for (count = 0; count < table->UvdLevelCount; count++) { | 1700 | for (count = 0; count < table->UvdLevelCount; count++) { |
1701 | table->UvdLevel[count].MinVoltage = 0; | ||
1699 | table->UvdLevel[count].VclkFrequency = mm_table->entries[count].vclk; | 1702 | table->UvdLevel[count].VclkFrequency = mm_table->entries[count].vclk; |
1700 | table->UvdLevel[count].DclkFrequency = mm_table->entries[count].dclk; | 1703 | table->UvdLevel[count].DclkFrequency = mm_table->entries[count].dclk; |
1701 | table->UvdLevel[count].MinVoltage |= (mm_table->entries[count].vddc * | 1704 | table->UvdLevel[count].MinVoltage |= (mm_table->entries[count].vddc * |
@@ -2011,6 +2014,7 @@ static int polaris10_init_smc_table(struct pp_hwmgr *hwmgr) | |||
2011 | if (POLARIS10_VOLTAGE_CONTROL_NONE != data->voltage_control) | 2014 | if (POLARIS10_VOLTAGE_CONTROL_NONE != data->voltage_control) |
2012 | polaris10_populate_smc_voltage_tables(hwmgr, table); | 2015 | polaris10_populate_smc_voltage_tables(hwmgr, table); |
2013 | 2016 | ||
2017 | table->SystemFlags = 0; | ||
2014 | if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, | 2018 | if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, |
2015 | PHM_PlatformCaps_AutomaticDCTransition)) | 2019 | PHM_PlatformCaps_AutomaticDCTransition)) |
2016 | table->SystemFlags |= PPSMC_SYSTEMFLAG_GPIO_DC; | 2020 | table->SystemFlags |= PPSMC_SYSTEMFLAG_GPIO_DC; |
@@ -2104,6 +2108,7 @@ static int polaris10_init_smc_table(struct pp_hwmgr *hwmgr) | |||
2104 | table->MemoryThermThrottleEnable = 1; | 2108 | table->MemoryThermThrottleEnable = 1; |
2105 | table->PCIeBootLinkLevel = 0; | 2109 | table->PCIeBootLinkLevel = 0; |
2106 | table->PCIeGenInterval = 1; | 2110 | table->PCIeGenInterval = 1; |
2111 | table->VRConfig = 0; | ||
2107 | 2112 | ||
2108 | result = polaris10_populate_vr_config(hwmgr, table); | 2113 | result = polaris10_populate_vr_config(hwmgr, table); |
2109 | PP_ASSERT_WITH_CODE(0 == result, | 2114 | PP_ASSERT_WITH_CODE(0 == result, |