Merge remote-tracking branch 'ftrace/for-next'

[deliverable/linux.git] / drivers / gpu / drm / amd / powerplay / hwmgr / fiji_powertune.c

diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c
index 44658451a8d2eef6c4a5c0e061cb2351bcad0ec3..f5992ea0c56f96fea6c87c3f26325e2b4ceba77f 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c
+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/fiji_powertune.c
@@ -56,8 +56,6 @@ void fiji_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
                fiji_hwmgr->power_tune_defaults = &fiji_power_tune_data_set_array[0];
 
        /* Assume disabled */
-       phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
-                       PHM_PlatformCaps_PowerContainment);
        phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
                        PHM_PlatformCaps_CAC);
        phm_cap_unset(hwmgr->platform_descriptor.platformCaps,
@@ -77,9 +75,8 @@ void fiji_initialize_power_tune_defaults(struct pp_hwmgr *hwmgr)
 
                fiji_hwmgr->fast_watermark_threshold = 100;
 
-               if (hwmgr->powercontainment_enabled) {
-                       phm_cap_set(hwmgr->platform_descriptor.platformCaps,
-                                   PHM_PlatformCaps_PowerContainment);
+               if (phm_cap_enabled(hwmgr->platform_descriptor.platformCaps,
+                                       PHM_PlatformCaps_PowerContainment)) {
                        tmp = 1;
                        fiji_hwmgr->enable_dte_feature = tmp ? false : true;
                        fiji_hwmgr->enable_tdc_limit_feature = tmp ? true : false;