Commit 7f963d9f authored by Alex Deucher's avatar Alex Deucher

drm/amdgpu/navi10: add uclk activity sensor

Query the metrics table for the current uclk activity.
Reviewed-by: default avatarEvan Quan <evan.quan@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f54eeab4
...@@ -879,6 +879,7 @@ static int navi10_get_gpu_power(struct smu_context *smu, uint32_t *value) ...@@ -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, static int navi10_get_current_activity_percent(struct smu_context *smu,
enum amd_pp_sensors sensor,
uint32_t *value) uint32_t *value)
{ {
int ret = 0; int ret = 0;
...@@ -894,7 +895,17 @@ static int navi10_get_current_activity_percent(struct smu_context *smu, ...@@ -894,7 +895,17 @@ static int navi10_get_current_activity_percent(struct smu_context *smu,
if (ret) if (ret)
return 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; return 0;
} }
...@@ -1307,8 +1318,9 @@ static int navi10_read_sensor(struct smu_context *smu, ...@@ -1307,8 +1318,9 @@ static int navi10_read_sensor(struct smu_context *smu,
*(uint32_t *)data = pptable->FanMaximumRpm; *(uint32_t *)data = pptable->FanMaximumRpm;
*size = 4; *size = 4;
break; break;
case AMDGPU_PP_SENSOR_MEM_LOAD:
case AMDGPU_PP_SENSOR_GPU_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; *size = 4;
break; break;
case AMDGPU_PP_SENSOR_GPU_POWER: case AMDGPU_PP_SENSOR_GPU_POWER:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment