[PATCH] drm/amd/powerplay: avoid using pm_en before it is initialized 2nd
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 a second patch that avoid using pm_en in pp_get_asic_baco_capability Signed-off-by: Tiecheng Zhou Signed-off-by: Yintian Tao --- 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 fdff3e1c5e95..b27f71c75550 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(>smu_lock); -- 2.17.1 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH] drm/amd/powerplay: avoid using pm_en before it is initialized
[AMD Official Use Only - Internal Distribution Only] Reviewed-by: Emily Deng >-Original Message- >From: amd-gfx On Behalf Of Zhou, >Tiecheng >Sent: Friday, April 3, 2020 12:42 PM >To: Zhou, Tiecheng ; amd- >g...@lists.freedesktop.org >Cc: Tao, Yintian >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 >Sent: Thursday, April 2, 2020 5:29 PM >To: amd-gfx@lists.freedesktop.org >Cc: Zhou, Tiecheng ; Tao, Yintian > >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 >Signed-off-by: Yintian Tao >--- > 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(>smu_lock); >-- >2.17.1 >___ >amd-gfx mailing list >amd-gfx@lists.freedesktop.org >https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.fre >edesktop.org%2Fmailman%2Flistinfo%2Famd- >gfxdata=02%7C01%7CEmily.Deng%40amd.com%7Cfc7cc02f1db043b393 >1108d7d7895f4d%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637 >214857946885870sdata=J8iQUQc8phHtblO1gn9TkoI%2BJ%2BehvD4RVfi >7MybTuCQ%3Dreserved=0 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
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 Sent: Thursday, April 2, 2020 5:29 PM To: amd-gfx@lists.freedesktop.org Cc: Zhou, Tiecheng ; Tao, Yintian 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 Signed-off-by: Yintian Tao --- 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(>smu_lock); -- 2.17.1 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[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 Signed-off-by: Yintian Tao --- 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(>smu_lock); -- 2.17.1 ___ amd-gfx mailing list amd-gfx@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/amd-gfx