drm/amd/pm: correct the metrics version for SMU 11.0.11/12/13

[ Upstream commit 396beb91a9eb86cbfa404e4220cca8f3ada70777 ]

Correct the metrics version used for SMU 11.0.11/12/13.
Fixes misreported GPU metrics (e.g., fan speed, etc.) depending
on which version of SMU firmware is loaded.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1925
Signed-off-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
index 38f04836c82f2d5d26dd8c8bee6cbd0bd3ec6712..7a1e225fb82309cf4f5790ef0ab095c0e69c3eb8 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c
@@ -586,12 +586,28 @@ static int sienna_cichlid_get_smu_metrics_data(struct smu_context *smu,
        uint16_t average_gfx_activity;
        int ret = 0;
 
-       if ((smu->adev->ip_versions[MP1_HWIP][0] == IP_VERSION(11, 0, 7)) &&
-               (smu->smc_fw_version >= 0x3A4900))
-               use_metrics_v3 = true;
-       else if ((smu->adev->ip_versions[MP1_HWIP][0] == IP_VERSION(11, 0, 7)) &&
-               (smu->smc_fw_version >= 0x3A4300))
-               use_metrics_v2 =  true;
+       switch (smu->adev->ip_versions[MP1_HWIP][0]) {
+       case IP_VERSION(11, 0, 7):
+               if (smu->smc_fw_version >= 0x3A4900)
+                       use_metrics_v3 = true;
+               else if (smu->smc_fw_version >= 0x3A4300)
+                       use_metrics_v2 = true;
+               break;
+       case IP_VERSION(11, 0, 11):
+               if (smu->smc_fw_version >= 0x412D00)
+                       use_metrics_v2 = true;
+               break;
+       case IP_VERSION(11, 0, 12):
+               if (smu->smc_fw_version >= 0x3B2300)
+                       use_metrics_v2 = true;
+               break;
+       case IP_VERSION(11, 0, 13):
+               if (smu->smc_fw_version >= 0x491100)
+                       use_metrics_v2 = true;
+               break;
+       default:
+               break;
+       }
 
        ret = smu_cmn_get_metrics_table(smu,
                                        NULL,
@@ -3701,13 +3717,28 @@ static ssize_t sienna_cichlid_get_gpu_metrics(struct smu_context *smu,
        uint16_t average_gfx_activity;
        int ret = 0;
 
-       if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(11, 0, 7)) &&
-               (smu->smc_fw_version >= 0x3A4900))
-               use_metrics_v3 = true;
-       else if ((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(11, 0, 7)) &&
-               (smu->smc_fw_version >= 0x3A4300))
-               use_metrics_v2 = true;
-
+       switch (smu->adev->ip_versions[MP1_HWIP][0]) {
+       case IP_VERSION(11, 0, 7):
+               if (smu->smc_fw_version >= 0x3A4900)
+                       use_metrics_v3 = true;
+               else if (smu->smc_fw_version >= 0x3A4300)
+                       use_metrics_v2 = true;
+               break;
+       case IP_VERSION(11, 0, 11):
+               if (smu->smc_fw_version >= 0x412D00)
+                       use_metrics_v2 = true;
+               break;
+       case IP_VERSION(11, 0, 12):
+               if (smu->smc_fw_version >= 0x3B2300)
+                       use_metrics_v2 = true;
+               break;
+       case IP_VERSION(11, 0, 13):
+               if (smu->smc_fw_version >= 0x491100)
+                       use_metrics_v2 = true;
+               break;
+       default:
+               break;
+       }
 
        ret = smu_cmn_get_metrics_table(smu,
                                        &metrics_external,