drm/amd/powerplay: expose Vega12 realtime memory utilization
authorEvan Quan <evan.quan@amd.com>
Wed, 24 Apr 2019 07:19:36 +0000 (15:19 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Fri, 24 May 2019 17:20:48 +0000 (12:20 -0500)
Enable realtime memory utilization report on Vega12.

Signed-off-by: Evan Quan <evan.quan@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c

index a9d29b4..1a909dd 100644 (file)
@@ -1308,6 +1308,7 @@ static int vega12_get_current_mclk_freq(struct pp_hwmgr *hwmgr, uint32_t *mclk_f
 
 static int vega12_get_current_activity_percent(
                struct pp_hwmgr *hwmgr,
+               int idx,
                uint32_t *activity_percent)
 {
        SmuMetrics_t metrics_table;
@@ -1317,7 +1318,17 @@ static int vega12_get_current_activity_percent(
        if (ret)
                return ret;
 
-       *activity_percent = metrics_table.AverageGfxActivity;
+       switch (idx) {
+       case AMDGPU_PP_SENSOR_GPU_LOAD:
+               *activity_percent = metrics_table.AverageGfxActivity;
+               break;
+       case AMDGPU_PP_SENSOR_MEM_LOAD:
+               *activity_percent = metrics_table.AverageUclkActivity;
+               break;
+       default:
+               pr_err("Invalid index for retrieving clock activity\n");
+               return -EINVAL;
+       }
 
        return ret;
 }
@@ -1341,7 +1352,8 @@ static int vega12_read_sensor(struct pp_hwmgr *hwmgr, int idx,
                        *size = 4;
                break;
        case AMDGPU_PP_SENSOR_GPU_LOAD:
-               ret = vega12_get_current_activity_percent(hwmgr, (uint32_t *)value);
+       case AMDGPU_PP_SENSOR_MEM_LOAD:
+               ret = vega12_get_current_activity_percent(hwmgr, idx, (uint32_t *)value);
                if (!ret)
                        *size = 4;
                break;