Commit 4a93d938 authored by Kent Russell's avatar Kent Russell Committed by Alex Deucher
Browse files

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: default avatarKent Russell <kent.russell@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6e5d64e3

drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c

+9 −7
Original line number Diff line number Diff line
@@ -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;