[PATCH 2/2] drm/amd/pm: report energy accumulator for smu 13.0.0

[Kevin Wang]

add energy accumulator on pmfw 0x004e8600 and above version.

Signed-off-by: Kevin Wang <kevin.w...@amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 26668cb00e0a..e868bfe1f0e1 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -2092,8 +2092,10 @@ static ssize_t smu_v13_0_0_get_gpu_metrics(struct 
smu_context *smu,
 
        gpu_metrics->average_socket_power = metrics->AverageSocketPower;
 
-       if ((mp1_ver == IP_VERSION(13, 0, 0) && smu->smc_fw_version <= 
0x004e1e00) ||
-           (mp1_ver == IP_VERSION(13, 0, 10) && smu->smc_fw_version <= 
0x00500800))
+       if ((mp1_ver == IP_VERSION(13, 0, 0) &&
+            (smu->smc_fw_version <= 0x004e1e00 || smu->smc_fw_version >= 
0x004e8600)) ||
+           (mp1_ver == IP_VERSION(13, 0, 10) &&
+            smu->smc_fw_version <= 0x00500800))
                gpu_metrics->energy_accumulator = metrics->EnergyAccumulator;
 
        if (metrics->AverageGfxActivity <= SMU_13_0_0_BUSY_THRESHOLD)
-- 
2.55.0