From 40bdc1a2ba4cc8f733aa490d269dcc0f32207233 Mon Sep 17 00:00:00 2001 From: Rui Teng Date: Sat, 22 Aug 2020 18:32:55 +0800 Subject: [PATCH] Revert "AMDGPU: Fix bug where DPM is not enabled after hibernate and resume" This reverts commit 19940a2b33761766956f6e32ed0f0e6d97377274. The original commit will cause s3 test failed on hawaii. Signed-off-by: Rui Teng --- drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c b/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c index c18169aa59ce5..02159ca29fa29 100644 --- a/drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c +++ b/drivers/gpu/drm/amd/pm/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)