Commit 2139d12b authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/amdgpu/swsmu/vangogh: use metrics table for voltages (v2) 



Fixes voltage reading for vddgfx and adds support for vddsoc.

v2: use new voltage enum

Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Reviewed-by: default avatarHuang Rui <ray.huang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 6cc24d8d

drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c

+17 −3
Original line number Diff line number Diff line
@@ -265,6 +265,12 @@ static int vangogh_get_smu_metrics_data(struct smu_context *smu, 
	case METRICS_THROTTLER_STATUS:

		*value = metrics->ThrottlerStatus;

		break;

	case METRICS_VOLTAGE_VDDGFX:

		*value = metrics->Voltage[2];

		break;

	case METRICS_VOLTAGE_VDDSOC:

		*value = metrics->Voltage[1];

		break;

	default:

		*value = UINT_MAX;

		break;
@@ -475,7 +481,15 @@ static int vangogh_read_sensor(struct smu_context *smu, 
		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VDDGFX:

		ret = smu_v11_0_get_gfx_vdd(smu, (uint32_t *)data);

		ret = vangogh_get_smu_metrics_data(smu,

						   METRICS_VOLTAGE_VDDGFX,

						   (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VDDNB:

		ret = vangogh_get_smu_metrics_data(smu,

						   METRICS_VOLTAGE_VDDSOC,

						   (uint32_t *)data);

		*size = 4;

		break;

	default: