drm/amdgpu: Use metrics data function to get unique_id for Aldebaran

This is abstracted well enough in the get_metrics_data function, so use
the function

Signed-off-by: Kent Russell <kent.russell@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
index cd81f848d45ab11196d64740b6e2b56d0150ee03..38af648cb857da66a39aef1efe851479e2a6af16 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c
@@ -650,6 +650,12 @@ static int aldebaran_get_smu_metrics_data(struct smu_context *smu,
        case METRICS_THROTTLER_STATUS:
                *value = metrics->ThrottlerStatus;
                break;
+       case METRICS_UNIQUE_ID_UPPER32:
+               *value = metrics->PublicSerialNumUpper32;
+               break;
+       case METRICS_UNIQUE_ID_LOWER32:
+               *value = metrics->PublicSerialNumLower32;
+               break;
        default:
                *value = UINT_MAX;
                break;
@@ -1614,16 +1620,12 @@ static void aldebaran_i2c_control_fini(struct smu_context *smu)
 static void aldebaran_get_unique_id(struct smu_context *smu)
 {
        struct amdgpu_device *adev = smu->adev;
-       SmuMetrics_t *metrics = smu->smu_table.metrics_table;
        uint32_t upper32 = 0, lower32 = 0;
-       int ret;
 
-       ret = smu_cmn_get_metrics_table(smu, NULL, false);
-       if (ret)
+       if (aldebaran_get_smu_metrics_data(smu, METRICS_UNIQUE_ID_UPPER32, &upper32))
+               goto out;
+       if (aldebaran_get_smu_metrics_data(smu, METRICS_UNIQUE_ID_LOWER32, &lower32))
                goto out;
-
-       upper32 = metrics->PublicSerialNumUpper32;
-       lower32 = metrics->PublicSerialNumLower32;
 
 out:
        adev->unique_id = ((uint64_t)upper32 << 32) | lower32;