diff options
author | Rex Zhu | 2018-04-04 08:11:45 +0200 |
---|---|---|
committer | Alex Deucher | 2018-05-15 20:43:17 +0200 |
commit | a0701722b68e69443dd3dd7970a9f343b7560a2c (patch) | |
tree | 74b7c703029f8957e492e0f538143b37f1a75047 /drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | |
parent | drm/gpu-sched: fix force APP kill hang(v4) (diff) | |
download | kernel-qcow2-linux-a0701722b68e69443dd3dd7970a9f343b7560a2c.tar.gz kernel-qcow2-linux-a0701722b68e69443dd3dd7970a9f343b7560a2c.tar.xz kernel-qcow2-linux-a0701722b68e69443dd3dd7970a9f343b7560a2c.zip |
Revert "drm/amd/powerply: fix power reading on Fiji"
we don't have limit of [50ms, 4sec] sampling period.
smu calculate average gpu power in real time.
we can read average gpu power through smu message or
read special register.
This reverts commit 462d8dcc9fec0d89f1ff6a1f93f1d4f670878c71.
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c')
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c index ed43dd39b5d6..5bccf895ba41 100644 --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c @@ -3364,8 +3364,7 @@ static int smu7_get_gpu_power(struct pp_hwmgr *hwmgr, "Failed to start pm status log!", return -1); - /* Sampling period from 50ms to 4sec */ - msleep_interruptible(200); + msleep_interruptible(20); PP_ASSERT_WITH_CODE(!smum_send_msg_to_smc(hwmgr, PPSMC_MSG_PmStatusLogSample), |