diff options
| author | Evan Quan <evan.quan@amd.com> | 2019-04-18 09:37:49 +0200 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-05-24 19:20:47 +0200 |
| commit | eef2d67ead3e14e284cc840894727b095fe774c2 (patch) | |
| tree | 51189c4de2aea3bece04eb3d00e625f47552020a /drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | |
| parent | drm/amd/powerplay: expose Vega12 current power (diff) | |
| download | linux-eef2d67ead3e14e284cc840894727b095fe774c2.tar.xz linux-eef2d67ead3e14e284cc840894727b095fe774c2.zip | |
drm/amd/powerplay: expose Vega12 current gpu activity
Provide the real sensor information for current gpu activity.
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>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c index 1997df39b645..a9d29b4be72f 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c @@ -1310,23 +1310,14 @@ static int vega12_get_current_activity_percent( struct pp_hwmgr *hwmgr, uint32_t *activity_percent) { + SmuMetrics_t metrics_table; int ret = 0; - uint32_t current_activity = 50; -#if 0 - ret = smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_GetAverageGfxActivity, 0); - if (!ret) { - current_activity = smum_get_argument(hwmgr); - if (current_activity > 100) { - PP_ASSERT(false, - "[GetCurrentActivityPercent] Activity Percentage Exceeds 100!"); - current_activity = 100; - } - } else - PP_ASSERT(false, - "[GetCurrentActivityPercent] Attempt To Send Get Average Graphics Activity to SMU Failed!"); -#endif - *activity_percent = current_activity; + ret = vega12_get_metrics_table(hwmgr, &metrics_table); + if (ret) + return ret; + + *activity_percent = metrics_table.AverageGfxActivity; return ret; } |