Skip to content

Commit 786436b

Browse files
Evan Quanalexdeucher
authored andcommitted
drm/amd/pm: do not use ixFEATURE_STATUS for checking smc running
This reverts commit f878122 ("drm/amdgpu: Fix bug where DPM is not enabled after hibernate and resume"). It was intended to fix Hawaii S4(hibernation) issue but break S3. As ixFEATURE_STATUS is filled with garbage data on resume which can be only cleared by reloading smc firmware(but that will involve many changes). So, we will revert this S4 fix and seek a new way. Signed-off-by: Evan Quan <evan.quan@amd.com> Tested-by: Sandeep Raghuraman <sandy.8925@gmail.com> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 277b080 commit 786436b

1 file changed

Lines changed: 1 addition & 4 deletions

File tree

drivers/gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2726,10 +2726,7 @@ static int ci_initialize_mc_reg_table(struct pp_hwmgr *hwmgr)
27262726

27272727
static bool ci_is_dpm_running(struct pp_hwmgr *hwmgr)
27282728
{
2729-
return (1 == PHM_READ_INDIRECT_FIELD(hwmgr->device,
2730-
CGS_IND_REG__SMC, FEATURE_STATUS,
2731-
VOLTAGE_CONTROLLER_ON))
2732-
? true : false;
2729+
return ci_is_smc_ram_running(hwmgr);
27332730
}
27342731

27352732
static int ci_smu_init(struct pp_hwmgr *hwmgr)

0 commit comments

Comments
 (0)