Skip to content

Commit

Permalink
Revert "AMDGPU: Fix bug where DPM is not enabled after hibernate and …
Browse files Browse the repository at this point in the history
…resume"

This reverts commit 19940a2.
The original commit will cause s3 test failed on hawaii.

Signed-off-by: Rui Teng <rui.teng@amd.com>
  • Loading branch information
Rui Teng authored and Rui Teng committed Aug 22, 2020
1 parent 7315131 commit 40bdc1a
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down

0 comments on commit 40bdc1a

Please sign in to comment.