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

[Kevin Wang]

add energy accumulator on pmfw 0x00685000 and above version.

Signed-off-by: Kevin Wang <kevin.w...@amd.com>
---
 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c 
b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index ed5796a985b2..76a606095ae3 100644
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -2157,6 +2157,7 @@ static void smu_v14_0_2_init_msg_ctl(struct smu_context 
*smu)
 static ssize_t smu_v14_0_2_get_gpu_metrics(struct smu_context *smu,
                                           void **table)
 {
+       uint32_t mp1_ver = amdgpu_ip_version(smu->adev, MP1_HWIP, 0);
        struct gpu_metrics_v1_3 *gpu_metrics =
                (struct gpu_metrics_v1_3 *)smu_driver_table_ptr(
                        smu, SMU_DRIVER_TABLE_GPU_METRICS);
@@ -2186,6 +2187,8 @@ static ssize_t smu_v14_0_2_get_gpu_metrics(struct 
smu_context *smu,
                                               metrics->Vcn1ActivityPercentage);
 
        gpu_metrics->average_socket_power = metrics->AverageSocketPower;
+       if (mp1_ver == IP_VERSION(14, 0, 3) && smu->smc_fw_version >= 
0x00685000)
+           gpu_metrics->energy_accumulator = metrics->EnergyAccumulator;
 
        if (metrics->AverageGfxActivity <= SMU_14_0_2_BUSY_THRESHOLD)
                gpu_metrics->average_gfxclk_frequency = 
metrics->AverageGfxclkFrequencyPostDs;
-- 
2.55.0