Commit c5207876 authored Apr 02, 2020 by Tiecheng Zhou Committed by Alex Deucher Apr 03, 2020

drm/amd/powerplay: avoid using pm_en before it is initialized



hwmgr->pm_en is initialized at hwmgr_hw_init.
during amdgpu_device_init, there is amdgpu_asic_reset that calls to
pp_get_asic_baco_capability, while hwmgr->pm_en has not yet been initialized.

so avoid using pm_en in pp_get_asic_baco_capability.

Reviewed-by: Emily Deng <Emily.Deng@amd.com>
Signed-off-by: Tiecheng Zhou <Tiecheng.Zhou@amd.com>
Signed-off-by: Yintian Tao <yttao@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 4ee2bb22

drivers/gpu/drm/amd/powerplay/amd_powerplay.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1452,7 +1452,8 @@ static int pp_get_asic_baco_state(void handle, int state)
		if (!hwmgr)
		return -EINVAL;

		if (!hwmgr->pm_en \|\| !hwmgr->hwmgr_func->get_asic_baco_state)
		if (!(hwmgr->not_vf && amdgpu_dpm) \|\|
		!hwmgr->hwmgr_func->get_asic_baco_state)
		return 0;

		mutex_lock(&hwmgr->smu_lock);

Admin message