Skip to content

Commit 1eef878

Browse files
Asad Kamalalexdeucher
authored andcommitted
drm/amd/pm: Remove host limit metrics support
Firmware algorithm changed and the values in this version are not accurate thereby remove host limit metric support for smu_v13_0_6, smu_v13_0_12 & smu_v13_0_14 Signed-off-by: Asad Kamal <asad.kamal@amd.com> Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 5b3c08a commit 1eef878

File tree

1 file changed

+0
-15
lines changed

1 file changed

+0
-15
lines changed

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,6 @@ enum smu_v13_0_6_caps {
109109
SMU_CAP(OTHER_END_METRICS),
110110
SMU_CAP(SET_UCLK_MAX),
111111
SMU_CAP(PCIE_METRICS),
112-
SMU_CAP(HST_LIMIT_METRICS),
113112
SMU_CAP(MCA_DEBUG_MODE),
114113
SMU_CAP(PER_INST_METRICS),
115114
SMU_CAP(CTF_LIMIT),
@@ -325,8 +324,6 @@ static void smu_v13_0_14_init_caps(struct smu_context *smu)
325324

326325
if (fw_ver >= 0x05550E00)
327326
smu_v13_0_6_cap_set(smu, SMU_CAP(OTHER_END_METRICS));
328-
if (fw_ver >= 0x05551000)
329-
smu_v13_0_6_cap_set(smu, SMU_CAP(HST_LIMIT_METRICS));
330327
if (fw_ver >= 0x05550B00)
331328
smu_v13_0_6_cap_set(smu, SMU_CAP(PER_INST_METRICS));
332329
if (fw_ver >= 0x5551200)
@@ -342,7 +339,6 @@ static void smu_v13_0_12_init_caps(struct smu_context *smu)
342339
SMU_CAP(RMA_MSG),
343340
SMU_CAP(ACA_SYND),
344341
SMU_CAP(OTHER_END_METRICS),
345-
SMU_CAP(HST_LIMIT_METRICS),
346342
SMU_CAP(PER_INST_METRICS) };
347343
uint32_t fw_ver = smu->smc_fw_version;
348344

@@ -387,8 +383,6 @@ static void smu_v13_0_6_init_caps(struct smu_context *smu)
387383
smu_v13_0_6_cap_clear(smu, SMU_CAP(RMA_MSG));
388384
smu_v13_0_6_cap_clear(smu, SMU_CAP(ACA_SYND));
389385

390-
if (fw_ver >= 0x04556F00)
391-
smu_v13_0_6_cap_set(smu, SMU_CAP(HST_LIMIT_METRICS));
392386
if (fw_ver >= 0x04556A00)
393387
smu_v13_0_6_cap_set(smu, SMU_CAP(PER_INST_METRICS));
394388
} else {
@@ -408,8 +402,6 @@ static void smu_v13_0_6_init_caps(struct smu_context *smu)
408402
smu_v13_0_6_cap_clear(smu, SMU_CAP(RMA_MSG));
409403
if (fw_ver < 0x00555600)
410404
smu_v13_0_6_cap_clear(smu, SMU_CAP(ACA_SYND));
411-
if (pgm == 0 && fw_ver >= 0x557900)
412-
smu_v13_0_6_cap_set(smu, SMU_CAP(HST_LIMIT_METRICS));
413405
}
414406
if (((pgm == 7) && (fw_ver >= 0x7550700)) ||
415407
((pgm == 0) && (fw_ver >= 0x00557900)) ||
@@ -2674,13 +2666,6 @@ static ssize_t smu_v13_0_6_get_gpu_metrics(struct smu_context *smu, void **table
26742666
gpu_metrics->xcp_stats[i].gfx_busy_acc[idx] =
26752667
SMUQ10_ROUND(GET_GPU_METRIC_FIELD(GfxBusyAcc,
26762668
version)[inst]);
2677-
2678-
if (smu_v13_0_6_cap_supported(
2679-
smu, SMU_CAP(HST_LIMIT_METRICS)))
2680-
gpu_metrics->xcp_stats[i].gfx_below_host_limit_acc[idx] =
2681-
SMUQ10_ROUND(GET_GPU_METRIC_FIELD
2682-
(GfxclkBelowHostLimitAcc, version)
2683-
[inst]);
26842669
idx++;
26852670
}
26862671
}

0 commit comments

Comments
 (0)