drm/amdgpu/pm: add VCN activity for SMU 13.0.0/7

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/smu13/smu_v13_0_0_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
index 898487ad6cd2e01ebbfe787ddfd0d583e27d333f..5a9711e8cf689569a13b7f1e9041d1c66ea70ef6 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c
@@ -836,6 +836,10 @@ static int smu_v13_0_0_get_smu_metrics_data(struct smu_context *smu,
        case METRICS_AVERAGE_MEMACTIVITY:
                *value = metrics->AverageUclkActivity;
                break;
+       case METRICS_AVERAGE_VCNACTIVITY:
+               *value = max(metrics->Vcn0ActivityPercentage,
+                            metrics->Vcn1ActivityPercentage);
+               break;
        case METRICS_AVERAGE_SOCKETPOWER:
                *value = metrics->AverageSocketPower << 8;
                break;
@@ -962,6 +966,12 @@ static int smu_v13_0_0_read_sensor(struct smu_context *smu,
                                                       (uint32_t *)data);
                *size = 4;
                break;
+       case AMDGPU_PP_SENSOR_VCN_LOAD:
+               ret = smu_v13_0_0_get_smu_metrics_data(smu,
+                                                      METRICS_AVERAGE_VCNACTIVITY,
+                                                      (uint32_t *)data);
+               *size = 4;
+               break;
        case AMDGPU_PP_SENSOR_GPU_AVG_POWER:
                ret = smu_v13_0_0_get_smu_metrics_data(smu,
                                                       METRICS_AVERAGE_SOCKETPOWER,

diff --git a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
index 19f47811f6db2d25b24b2cf7f3654b1d33343827..c8f4f6fb408345a641b0c4832b143c344f0cbf8d 100644 (file)
--- a/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
+++ b/drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c
@@ -807,6 +807,10 @@ static int smu_v13_0_7_get_smu_metrics_data(struct smu_context *smu,
                else
                        *value = metrics->AverageMemclkFrequencyPreDs;
                break;
+       case METRICS_AVERAGE_VCNACTIVITY:
+               *value = max(metrics->Vcn0ActivityPercentage,
+                            metrics->Vcn1ActivityPercentage);
+               break;
        case METRICS_AVERAGE_VCLK:
                *value = metrics->AverageVclk0Frequency;
                break;
@@ -951,6 +955,12 @@ static int smu_v13_0_7_read_sensor(struct smu_context *smu,
                                                       (uint32_t *)data);
                *size = 4;
                break;
+       case AMDGPU_PP_SENSOR_VCN_LOAD:
+               ret = smu_v13_0_7_get_smu_metrics_data(smu,
+                                                      METRICS_AVERAGE_VCNACTIVITY,
+                                                      (uint32_t *)data);
+               *size = 4;
+               break;
        case AMDGPU_PP_SENSOR_GPU_AVG_POWER:
                ret = smu_v13_0_7_get_smu_metrics_data(smu,
                                                       METRICS_AVERAGE_SOCKETPOWER,