[AMD Official Use Only - Internal Distribution Only] Sorry for bothering, I'm going to send another one, It seems pm_en should not be used in get_asic_baco_capability, get_asic_baco_state, set_asic_baco_state. -----Original Message----- From: Tiecheng Zhou <Tiecheng.Zhou@xxxxxxx> Sent: Monday, April 27, 2020 9:57 AM To: amd-gfx@xxxxxxxxxxxxxxxxxxxxx Cc: Zhou, Tiecheng <Tiecheng.Zhou@xxxxxxx>; Tao, Yintian <Yintian.Tao@xxxxxxx> Subject: [PATCH 2/2] drm/amd/powerplay: avoid using pm_en before it is initialized revised 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. this is to avoid using pm_en in pp_get_asic_baco_capability Signed-off-by: Tiecheng Zhou <Tiecheng.Zhou@xxxxxxx> Signed-off-by: Yintian Tao <yttao@xxxxxxx> --- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c index 71b843f542d8..fb4ca614f6e3 100644 --- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c +++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c @@ -1438,7 +1438,8 @@ static int pp_get_asic_baco_capability(void *handle, bool *cap) if (!hwmgr) return -EINVAL; - if (!hwmgr->pm_en || !hwmgr->hwmgr_func->get_asic_baco_capability) + if (!(hwmgr->not_vf && amdgpu_dpm) || + !hwmgr->hwmgr_func->get_asic_baco_capability) return 0; mutex_lock(&hwmgr->smu_lock); -- 2.17.1 _______________________________________________ amd-gfx mailing list amd-gfx@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/amd-gfx
