Skip to content

Commit f53dedd

Browse files
Li Maalexdeucher
authored andcommitted
drm/amd/swsmu: modify the gfx activity scaling
Add an if condition for gfx activity because the scaling has been changed after smu fw version 5d4600. And remove a warning log. Signed-off-by: Li Ma <li.ma@amd.com> Reviewed-by: Yifan Zhang <yifan1.zhang@amd.com> Acked-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 1761d9a commit f53dedd

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ int smu_v14_0_check_fw_version(struct smu_context *smu)
229229
smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_2;
230230
break;
231231
case IP_VERSION(14, 0, 0):
232-
if ((smu->smc_fw_version < 0x5d3a00))
233-
dev_warn(smu->adev->dev, "The PMFW version(%x) is behind in this BIOS!\n", smu->smc_fw_version);
234232
smu->smc_driver_if_version = SMU14_DRIVER_IF_VERSION_SMU_V14_0_0;
235233
break;
236234
default:

drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,10 @@ static int smu_v14_0_0_get_smu_metrics_data(struct smu_context *smu,
261261
*value = metrics->MpipuclkFrequency;
262262
break;
263263
case METRICS_AVERAGE_GFXACTIVITY:
264-
*value = metrics->GfxActivity / 100;
264+
if ((smu->smc_fw_version > 0x5d4600))
265+
*value = metrics->GfxActivity;
266+
else
267+
*value = metrics->GfxActivity / 100;
265268
break;
266269
case METRICS_AVERAGE_VCNACTIVITY:
267270
*value = metrics->VcnActivity / 100;

0 commit comments

Comments
 (0)