drm/amd/pm: Use gpu_metrics_v1_8 for smu_v13_0_12

Use gpu_metrics_v1_8 for smu_v13_0_12 to fill metrics data

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>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
index 238bd71baa6ddf8210051cba831013dccc6bc10f..5d4437e413cc2113bceb7f17e414f8734512afd7 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c
@@ -345,8 +345,8 @@ int smu_v13_0_12_get_smu_metrics_data(struct smu_context *smu,
 ssize_t smu_v13_0_12_get_gpu_metrics(struct smu_context *smu, void **table)
 {
        struct smu_table_context *smu_table = &smu->smu_table;
-       struct gpu_metrics_v1_7 *gpu_metrics =
-               (struct gpu_metrics_v1_7 *)smu_table->gpu_metrics_table;
+       struct gpu_metrics_v1_8 *gpu_metrics =
+               (struct gpu_metrics_v1_8 *)smu_table->gpu_metrics_table;
        int ret = 0, xcc_id, inst, i, j, k, idx;
        struct amdgpu_device *adev = smu->adev;
        u8 num_jpeg_rings_gpu_metrics;
@@ -357,7 +357,7 @@ ssize_t smu_v13_0_12_get_gpu_metrics(struct smu_context *smu, void **table)
        metrics = kzalloc(sizeof(MetricsTable_t), GFP_KERNEL);
        memcpy(metrics, smu_table->metrics_table, sizeof(MetricsTable_t));
 
-       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 7);
+       smu_cmn_init_soft_gpu_metrics(gpu_metrics, 1, 8);
 
        gpu_metrics->temperature_hotspot =
                SMUQ10_ROUND(metrics->MaxSocketTemperature);
@@ -474,6 +474,16 @@ ssize_t smu_v13_0_12_get_gpu_metrics(struct smu_context *smu, void **table)
                                SMUQ10_ROUND(metrics->GfxBusy[inst]);
                        gpu_metrics->xcp_stats[i].gfx_busy_acc[idx] =
                                SMUQ10_ROUND(metrics->GfxBusyAcc[inst]);
+                       if (smu_v13_0_6_cap_supported(smu, SMU_CAP(HST_LIMIT_METRICS))) {
+                               gpu_metrics->xcp_stats[i].gfx_below_host_limit_ppt_acc[idx] =
+                                       SMUQ10_ROUND(metrics->GfxclkBelowHostLimitPptAcc[inst]);
+                               gpu_metrics->xcp_stats[i].gfx_below_host_limit_thm_acc[idx] =
+                                       SMUQ10_ROUND(metrics->GfxclkBelowHostLimitThmAcc[inst]);
+                               gpu_metrics->xcp_stats[i].gfx_low_utilization_acc[idx] =
+                                       SMUQ10_ROUND(metrics->GfxclkLowUtilizationAcc[inst]);
+                               gpu_metrics->xcp_stats[i].gfx_below_host_limit_total_acc[idx] =
+                                       SMUQ10_ROUND(metrics->GfxclkBelowHostLimitTotalAcc[inst]);
+                       }
                        idx++;
                }
        }

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
index 4f767948b172769988552cb549aab90b3d7a9d51..8900c94bda0ec5395c20646bc385d63205484cff 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c
@@ -335,6 +335,7 @@ static void smu_v13_0_12_init_caps(struct smu_context *smu)
 
        if (fw_ver >= 0x00561E00)
                smu_v13_0_6_cap_set(smu, SMU_CAP(STATIC_METRICS));
+
 }
 
 static void smu_v13_0_6_init_caps(struct smu_context *smu)