diff options
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c index 0f75af33e581..0fbaeb19a542 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c | |||
@@ -905,7 +905,6 @@ int smu7_enable_power_containment(struct pp_hwmgr *hwmgr) | |||
905 | if (0 == smc_result) { | 905 | if (0 == smc_result) { |
906 | uint32_t default_limit = | 906 | uint32_t default_limit = |
907 | (uint32_t)(cac_table->usMaximumPowerDeliveryLimit * 256); | 907 | (uint32_t)(cac_table->usMaximumPowerDeliveryLimit * 256); |
908 | |||
909 | data->power_containment_features |= | 908 | data->power_containment_features |= |
910 | POWERCONTAINMENT_FEATURE_PkgPwrLimit; | 909 | POWERCONTAINMENT_FEATURE_PkgPwrLimit; |
911 | 910 | ||
@@ -976,10 +975,12 @@ int smu7_power_control_set_level(struct pp_hwmgr *hwmgr) | |||
976 | adjust_percent = hwmgr->platform_descriptor.TDPAdjustmentPolarity ? | 975 | adjust_percent = hwmgr->platform_descriptor.TDPAdjustmentPolarity ? |
977 | hwmgr->platform_descriptor.TDPAdjustment : | 976 | hwmgr->platform_descriptor.TDPAdjustment : |
978 | (-1 * hwmgr->platform_descriptor.TDPAdjustment); | 977 | (-1 * hwmgr->platform_descriptor.TDPAdjustment); |
979 | /* SMC requested that target_tdp to be 7 bit fraction in DPM table | 978 | |
980 | * but message to be 8 bit fraction for messages | 979 | if (hwmgr->chip_id > CHIP_TONGA) |
981 | */ | 980 | target_tdp = ((100 + adjust_percent) * (int)(cac_table->usTDP * 256)) / 100; |
982 | target_tdp = ((100 + adjust_percent) * (int)(cac_table->usTDP * 256)) / 100; | 981 | else |
982 | target_tdp = ((100 + adjust_percent) * (int)(cac_table->usConfigurableTDP * 256)) / 100; | ||
983 | |||
983 | result = smu7_set_overdriver_target_tdp(hwmgr, (uint32_t)target_tdp); | 984 | result = smu7_set_overdriver_target_tdp(hwmgr, (uint32_t)target_tdp); |
984 | } | 985 | } |
985 | 986 | ||