[PATCH 2/2] drm/amdgpu: add sclk/uclk sensor support for vega20

[Alex Deucher]

Query the metrics table to get the average sclk and uclk.

Signed-off-by: Alex Deucher <alexander.deucher at amd.com>
---
 drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
index 9204e4e50d09..763d73af6cd1 100644
--- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c
@@ -3117,6 +3117,36 @@ static int vega20_thermal_get_temperature(struct smu_context *smu,
 
 	return 0;
 }
+
+static int vega20_get_avg_clocks(struct smu_context *smu,
+				 enum amd_pp_sensors sensor,
+				 uint32_t *value)
+{
+	SmuMetrics_t metrics;
+	int ret = 0;
+
+	if (!value)
+		return -EINVAL;
+
+	ret = smu_update_table(smu, SMU_TABLE_SMU_METRICS, (void *)&metrics, false);
+	if (ret)
+		return ret;
+
+	switch (sensor) {
+	case AMDGPU_PP_SENSOR_GFX_SCLK:
+		*value = metrics.AverageGfxclkFrequency * 100;
+		break;
+	case AMDGPU_PP_SENSOR_GFX_MCLK:
+		*value = metrics.AverageUclkFrequency * 100;
+		break;
+	default:
+		pr_err("Invalid sensor for retrieving avg clock\n");
+		return -EINVAL;
+	}
+
+	return 0;
+}
+
 static int vega20_read_sensor(struct smu_context *smu,
 				 enum amd_pp_sensors sensor,
 				 void *data, uint32_t *size)
@@ -3147,6 +3177,11 @@ static int vega20_read_sensor(struct smu_context *smu,
 		ret = vega20_thermal_get_temperature(smu, sensor, (uint32_t *)data);
 		*size = 4;
 		break;
+	case AMDGPU_PP_SENSOR_GFX_SCLK:
+	case AMDGPU_PP_SENSOR_GFX_MCLK:
+		ret = vega20_get_avg_clocks(smu, sensor, (uint32_t *)data);
+		*size = 4;
+		break;
 	default:
 		return -EINVAL;
 	}
-- 
2.20.1