Commit c7bae4aa authored by jie1zhan's avatar jie1zhan Committed by Alex Deucher
Browse files

drm/amdgpu: Correct the power calcultion for Renior/Cezanne. 

From smu firmware,the value of power is transferred  in units of watts.

Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/2321


Fixes: 137aac26 ("drm/amdgpu/smu12: fix power reporting on renoir")
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarJesse Zhang <Jesse.Zhang@amd.com>
Reviewed-by: default avatarAaron Liu <aaron.liu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 040625ab

drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c

+6 −1
Original line number Diff line number Diff line
@@ -1171,6 +1171,7 @@ static int renoir_get_smu_metrics_data(struct smu_context *smu, 
	int ret = 0;

	uint32_t apu_percent = 0;

	uint32_t dgpu_percent = 0;

	struct amdgpu_device *adev = smu->adev;





	ret = smu_cmn_get_metrics_table(smu,
@@ -1196,6 +1197,10 @@ static int renoir_get_smu_metrics_data(struct smu_context *smu, 
		*value = metrics->AverageUvdActivity / 100;

		break;

	case METRICS_AVERAGE_SOCKETPOWER:

		if (((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(12, 0, 1)) && (adev->pm.fw_version >= 0x40000f)) ||

		((adev->ip_versions[MP1_HWIP][0] == IP_VERSION(12, 0, 0)) && (adev->pm.fw_version >= 0x373200)))

			*value = metrics->CurrentSocketPower << 8;

		else

			*value = (metrics->CurrentSocketPower << 8) / 1000;

		break;

	case METRICS_TEMPERATURE_EDGE: