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

[Deng, Emily]

[AMD Official Use Only - Internal Distribution Only]

Reviewed-by: Emily Deng <Emily.Deng at amd.com>

>-----Original Message-----
>From: amd-gfx <amd-gfx-bounces at lists.freedesktop.org> On Behalf Of Zhou,
>Tiecheng
>Sent: Friday, April 3, 2020 12:42 PM
>To: Zhou, Tiecheng <Tiecheng.Zhou at amd.com>; amd-
>gfx at lists.freedesktop.org
>Cc: Tao, Yintian <Yintian.Tao at amd.com>
>Subject: RE: [PATCH] drm/amd/powerplay: avoid using pm_en before it is
>initialized
>
>[AMD Official Use Only - Internal Distribution Only]
>
>Ping...
>
>-----Original Message-----
>From: Tiecheng Zhou <Tiecheng.Zhou at amd.com>
>Sent: Thursday, April 2, 2020 5:29 PM
>To: amd-gfx at lists.freedesktop.org
>Cc: Zhou, Tiecheng <Tiecheng.Zhou at amd.com>; Tao, Yintian
><Yintian.Tao at amd.com>
>Subject: [PATCH] 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.
>
>Signed-off-by: Tiecheng Zhou <Tiecheng.Zhou at amd.com>
>Signed-off-by: Yintian Tao <yttao at amd.com>
>---
> 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..fdff3e1c5e95 100644
>--- a/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
>+++ b/drivers/gpu/drm/amd/powerplay/amd_powerplay.c
>@@ -1455,7 +1455,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);
>--
>2.17.1
>_______________________________________________
>amd-gfx mailing list
>amd-gfx at lists.freedesktop.org
>https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fre
>edesktop.org%2Fmailman%2Flistinfo%2Famd-
>gfx&data=02%7C01%7CEmily.Deng%40amd.com%7Cfc7cc02f1db043b393
>1108d7d7895f4d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637
>214857946885870&sdata=J8iQUQc8phHtblO1gn9TkoI%2BJ%2BehvD4RVfi
>7MybTuCQ%3D&reserved=0