drm/amdgpu/pm: add VCN activity for SMU 14.0.2

Wire up the query.

Reviewed-by: Lijo Lazar <lijo.lazar@amd.com>
Reviewed-by: Kenneth Feng <kenneth.feng@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
index e4089fd58711cd1c29d0bde738c1a2ef02c08167..21d1b34ada05354f2454abb2655dd168bf5d12cc 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c
@@ -756,6 +756,10 @@ static int smu_v14_0_2_get_smu_metrics_data(struct smu_context *smu,
        case METRICS_AVERAGE_MEMACTIVITY:
                *value = metrics->AverageUclkActivity;
                break;
+       case METRICS_AVERAGE_VCNACTIVITY:
+               *value = max(metrics->AverageVcn0ActivityPercentage,
+                            metrics->Vcn1ActivityPercentage);
+               break;
        case METRICS_AVERAGE_SOCKETPOWER:
                *value = metrics->AverageSocketPower << 8;
                break;
@@ -882,6 +886,12 @@ static int smu_v14_0_2_read_sensor(struct smu_context *smu,
                                                       (uint32_t *)data);
                *size = 4;
                break;
+       case AMDGPU_PP_SENSOR_VCN_LOAD:
+               ret = smu_v14_0_2_get_smu_metrics_data(smu,
+                                                      METRICS_AVERAGE_VCNACTIVITY,
+                                                      (uint32_t *)data);
+               *size = 4;
+               break;
        case AMDGPU_PP_SENSOR_GPU_AVG_POWER:
                ret = smu_v14_0_2_get_smu_metrics_data(smu,
                                                       METRICS_AVERAGE_SOCKETPOWER,