iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/amd/swsmu: correct wrong feature bit mapping

Browse Source 
1. when smc feature bit isn't mapped,
the feature state isn't showed on sysfs node of pp_features.
2. add pp_features table title

Signed-off-by: Kevin Wang <kevin1.wang@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
Kevin Wang 2020-10-16 16:59:25 +08:00 committed by Alex Deucher
parent f1bcddffe4
commit a6c42e8431
1 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c
View File

@ -431,10 +431,9 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,
char *buf) char *buf)
{ {
uint32_t feature_mask[2] = { 0 }; uint32_t feature_mask[2] = { 0 };
int32_t feature_index = 0; int feature_index = 0;
uint32_t count = 0; uint32_t count = 0;
uint32_t sort_feature[SMU_FEATURE_COUNT]; int8_t sort_feature[SMU_FEATURE_COUNT];
uint64_t hw_feature_count = 0;
size_t size = 0; size_t size = 0;
int ret = 0, i; int ret = 0, i;
@ -447,23 +446,31 @@ size_t smu_cmn_get_pp_feature_mask(struct smu_context *smu,
size = sprintf(buf + size, "features high: 0x%08x low: 0x%08x\n", size = sprintf(buf + size, "features high: 0x%08x low: 0x%08x\n",
feature_mask[1], feature_mask[0]); feature_mask[1], feature_mask[0]);
memset(sort_feature, -1, sizeof(sort_feature));
for (i = 0; i < SMU_FEATURE_COUNT; i++) { for (i = 0; i < SMU_FEATURE_COUNT; i++) {
feature_index = smu_cmn_to_asic_specific_index(smu, feature_index = smu_cmn_to_asic_specific_index(smu,
CMN2ASIC_MAPPING_FEATURE, CMN2ASIC_MAPPING_FEATURE,
i); i);
if (feature_index < 0) if (feature_index < 0)
continue; continue;
sort_feature[feature_index] = i; sort_feature[feature_index] = i;
hw_feature_count++;
} }
for (i = 0; i < hw_feature_count; i++) { size += sprintf(buf + size, "%-2s. %-20s %-3s : %-s\n",
"No", "Feature", "Bit", "State");
for (i = 0; i < SMU_FEATURE_COUNT; i++) {
if (sort_feature[i] < 0)
continue;
size += sprintf(buf + size, "%02d. %-20s (%2d) : %s\n", size += sprintf(buf + size, "%02d. %-20s (%2d) : %s\n",
count++, count++,
smu_get_feature_name(smu, sort_feature[i]), smu_get_feature_name(smu, sort_feature[i]),
i, i,
!!smu_cmn_feature_is_enabled(smu, sort_feature[i]) ? !!smu_cmn_feature_is_enabled(smu, sort_feature[i]) ?
"enabled" : "disabled"); "enabled" : "disabled");
} }
return size; return size;