drm/amdgpu/navi10: add uclk activity sensor

Query the metrics table for the current uclk activity.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
index 3df4c4715308bb4703ba47838423103ad7a9ca0b..880fe0930d9e42dd26d61b7c38b3faee369b477f 100644 (file)
--- a/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
+++ b/drivers/gpu/drm/amd/powerplay/navi10_ppt.c
@@ -879,6 +879,7 @@ static int navi10_get_gpu_power(struct smu_context *smu, uint32_t *value)
 }
 
 static int navi10_get_current_activity_percent(struct smu_context *smu,
+                                              enum amd_pp_sensors sensor,
                                               uint32_t *value)
 {
        int ret = 0;
@@ -894,7 +895,17 @@ static int navi10_get_current_activity_percent(struct smu_context *smu,
        if (ret)
                return ret;
 
-       *value = metrics.AverageGfxActivity;
+       switch (sensor) {
+       case AMDGPU_PP_SENSOR_GPU_LOAD:
+               *value = metrics.AverageGfxActivity;
+               break;
+       case AMDGPU_PP_SENSOR_MEM_LOAD:
+               *value = metrics.AverageUclkActivity;
+               break;
+       default:
+               pr_err("Invalid sensor for retrieving clock activity\n");
+               return -EINVAL;
+       }
 
        return 0;
 }
@@ -1307,8 +1318,9 @@ static int navi10_read_sensor(struct smu_context *smu,
                *(uint32_t *)data = pptable->FanMaximumRpm;
                *size = 4;
                break;
+       case AMDGPU_PP_SENSOR_MEM_LOAD:
        case AMDGPU_PP_SENSOR_GPU_LOAD:
-               ret = navi10_get_current_activity_percent(smu, (uint32_t *)data);
+               ret = navi10_get_current_activity_percent(smu, sensor, (uint32_t *)data);
                *size = 4;
                break;
        case AMDGPU_PP_SENSOR_GPU_POWER: