diff options
author | Rui Teng <tengrui@hotmail.com> | 2020-08-22 18:32:55 +0800 |
---|---|---|
committer | Rui Teng <rui.teng@amd.com> | 2020-08-24 10:59:31 +0800 |
commit | 725e643120ce3eab4ca8aff6f7983aa3d7651c67 (patch) | |
tree | 816de5a2fe332fa19454d72ba1eb511f129126c6 | |
parent | 39007ef5f8d956387980262d9e363aa67f70bb06 (diff) |
Revert "AMDGPU: Fix bug where DPM is not enabled after hibernate and resume"amd-20.40
This reverts commit 19940a2b33761766956f6e32ed0f0e6d97377274.
The original commit will cause s3 test failed on hawaii.
Signed-off-by: Rui Teng <rui.teng@amd.com>
Reviewed-by: Guchun Chen <guchun.chen@amd.com>
-rw-r--r-- | drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c index c18169aa59ce..02159ca29fa2 100644 --- a/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +++ b/drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c @@ -2725,10 +2725,7 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr) static bool ci_is_dpm_running(struct pp_hwmgr *hwmgr) { - return (1 == PHM_READ_INDIRECT_FIELD(hwmgr->device, - CGS_IND_REG__SMC, FEATURE_STATUS, - VOLTAGE_CONTROLLER_ON)) - ? true : false; + return ci_is_smc_ram_running(hwmgr); } static int ci_smu_init(struct pp_hwmgr *hwmgr) |