drm/amd/powerplay: correct Vega20 cached smu feature state
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: correct Vega20 cached smu feature state
Correct the cached smu feature state on pp_features sysfs setting.
Change-Id Icc4c3ce764876a0ffdc86ad4c8a8b9c9f0ed0e97
Signed-off-by Evan Quan <[email protected]>
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +19 -19
@@ -984,10 +984,7 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr) { struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); - uint64_t features_enabled; - int i; - bool enabled; - int ret = 0; + int i, ret = 0; PP_ASSERT_WITH_CODE((ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_DisableAllSmuFeatures,
@@ -995,17 +992,8 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr)"[DisableAllSMUFeatures] Failed to disable all smu features!" , return ret); - ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); -PP_ASSERT_WITH_CODE (!ret, -"[DisableAllSMUFeatures] Failed to get enabled smc features!" , - return ret); - -for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { - enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? - true : false; - data->smu_features[i].enabled = enabled; - data->smu_features[i].supported = enabled; - } +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) + data->smu_features[i].enabled =0 ;return 0 ; }
@@ -3242,10 +3230,11 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)static int vega20_set_ppfeature_status (struct pp_hwmgr *hwmgr,uint64_t new_ppfeature_masks) { -uint64_t features_enabled; -uint64_t features_to_enable; -uint64_t features_to_disable; -int ret =0 ; +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +uint64_t features_enabled, features_to_enable, features_to_disable; +int i, ret =0 ; +bool enabled;if (new_ppfeature_masks >= (1ULL <<GNLD_FEATURES_MAX ))return -EINVAL ;
@@ -3274,6 +3263,17 @@ static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfereturn ret; } +/* Update the cached feature enablement state */ + ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); +if (ret) +return ret; + +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { + enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? + true : false; + data->smu_features[i].enabled = enabled; + } +return 0 ; }
Signature · 6 lines
2.28.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Acked-by Alex Deucher <[email protected]>
________________________________
From: Quan, Evan <[email protected]>
Sent: Friday, August 7, 2020 5:30 AM
To: [email protected] <[email protected]>
Cc: Deucher, Alexander <[email protected]>; Kuehling, Felix <[email protected]>; Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: correct Vega20 cached smu feature state
Correct the cached smu feature state on pp_features sysfs setting.
Change-Id Icc4c3ce764876a0ffdc86ad4c8a8b9c9f0ed0e97
Signed-off-by Evan Quan <[email protected]>
--- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +19 -19
@@ -984,10 +984,7 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr) { struct vega20_hwmgr *data = (struct vega20_hwmgr *)(hwmgr->backend); - uint64_t features_enabled; - int i; - bool enabled; - int ret = 0; + int i, ret = 0; PP_ASSERT_WITH_CODE((ret = smum_send_msg_to_smc(hwmgr, PPSMC_MSG_DisableAllSmuFeatures,
@@ -995,17 +992,8 @@ static int vega20_disable_all_smu_features(struct pp_hwmgr *hwmgr)"[DisableAllSMUFeatures] Failed to disable all smu features!" , return ret); - ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); -PP_ASSERT_WITH_CODE (!ret, -"[DisableAllSMUFeatures] Failed to get enabled smc features!" , - return ret); - -for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { - enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? - true : false; - data->smu_features[i].enabled = enabled; - data->smu_features[i].supported = enabled; - } +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) + data->smu_features[i].enabled =0 ;return 0 ; }
@@ -3242,10 +3230,11 @@ static int vega20_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)static int vega20_set_ppfeature_status (struct pp_hwmgr *hwmgr,uint64_t new_ppfeature_masks) { -uint64_t features_enabled; -uint64_t features_to_enable; -uint64_t features_to_disable; -int ret =0 ; +struct vega20_hwmgr *data = + (struct vega20_hwmgr *)(hwmgr->backend); +uint64_t features_enabled, features_to_enable, features_to_disable; +int i, ret =0 ; +bool enabled;if (new_ppfeature_masks >= (1ULL <<GNLD_FEATURES_MAX ))return -EINVAL ;
@@ -3274,6 +3263,17 @@ static int vega20_set_ppfeature_status(struct pp_hwmgr *hwmgr, uint64_t new_ppfereturn ret; } +/* Update the cached feature enablement state */ + ret =vega20_get_enabled_smc_features (hwmgr, &features_enabled); +if (ret) +return ret; + +for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { + enabled = (features_enabled & data->smu_features[i].smu_feature_bitmap) ? + true : false; + data->smu_features[i].enabled = enabled; + } +return 0 ; }
--
2.28.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx