drm/amd/pm: Update SMUv13.0.12 partition metrics

Update SMUv13.0.12 partition metrics to partition metrics v1.1 schema.

Signed-off-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Asad Kamal <asad.kamal@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 f4bf0b558d868acc37a1865ad889342a150a5577..c6cf0d0c4b82516a0a978ede0cd21deaa3181541 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
@@ -719,15 +719,14 @@ static ssize_t smu_v13_0_12_get_temp_metrics(struct smu_context *smu,
 ssize_t smu_v13_0_12_get_xcp_metrics(struct smu_context *smu, struct amdgpu_xcp *xcp, void *table, void *smu_metrics)
 {
        const u8 num_jpeg_rings = NUM_JPEG_RINGS_FW;
-       struct amdgpu_partition_metrics_v1_0 *xcp_metrics;
+       struct smu_v13_0_6_partition_metrics *xcp_metrics;
        struct amdgpu_device *adev = smu->adev;
        MetricsTable_t *metrics;
        int inst, j, k, idx;
        u32 inst_mask;
 
        metrics = (MetricsTable_t *)smu_metrics;
-       xcp_metrics = (struct amdgpu_partition_metrics_v1_0 *) table;
-       smu_cmn_init_partition_metrics(xcp_metrics, 1, 0);
+       xcp_metrics = (struct smu_v13_0_6_partition_metrics *)table;
        amdgpu_xcp_get_inst_details(xcp, AMDGPU_XCP_VCN, &inst_mask);
        idx = 0;
        for_each_inst(k, inst_mask) {