diff options
| author | Kent Russell <kent.russell@amd.com> | 2019-08-23 09:13:18 -0400 |
|---|---|---|
| committer | Alex Deucher <alexander.deucher@amd.com> | 2019-08-23 11:31:16 -0500 |
| commit | 951e15c2b58436b30e435f3169c97e9f4e265b58 (patch) | |
| tree | 0e653a00eef78ef72c6b5c791b6c5a296a16c327 /drivers/gpu/drm/amd/powerplay/vega20_ppt.c | |
| parent | b313bbebd79f73c151413a86e205ded32ec71c85 (diff) | |
| download | linux-stable-951e15c2b58436b30e435f3169c97e9f4e265b58.tar.gz linux-stable-951e15c2b58436b30e435f3169c97e9f4e265b58.tar.bz2 linux-stable-951e15c2b58436b30e435f3169c97e9f4e265b58.zip | |
drm/powerplay: Fix Vega20 power reading again
For the 40.46 SMU release, they changed CurrSocketPower to
AverageSocketPower, but this was changed back in 40.47 so just check if
it's 40.46 and make the appropriate change
Tested with 40.45, 40.46 and 40.47 successfully
Signed-off-by: Kent Russell <kent.russell@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/vega20_ppt.c')
| -rw-r--r-- | drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c index e25f5db5014b..64386ee3f878 100644 --- a/drivers/gpu/drm/amd/powerplay/vega20_ppt.c +++ b/drivers/gpu/drm/amd/powerplay/vega20_ppt.c @@ -2932,10 +2932,11 @@ static int vega20_get_gpu_power(struct smu_context *smu, uint32_t *value) if (ret) return ret; - if (smu_version < 0x282e00) - *value = metrics.CurrSocketPower << 8; - else + /* For the 40.46 release, they changed the value name */ + if (smu_version == 0x282e00) *value = metrics.AverageSocketPower << 8; + else + *value = metrics.CurrSocketPower << 8; return 0; } |