Commit 690ae30b authored Apr 26, 2020 by Tiecheng Zhou Committed by Alex Deucher Apr 28, 2020

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
soc15_asic_reset (for V320 usecase, Vega10 asic), in which:
1) soc15_asic_reset_method calls to pp_get_asic_baco_capability (pm_en)
2) soc15_asic_baco_reset calls to pp_set_asic_baco_state (pm_en)

pm_en is used in the above two cases while it has not yet been initialized

So avoid using pm_en in the above two functions for V320 passthrough.

Reviewed-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Tiecheng Zhou <Tiecheng.Zhou@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

parent 1e4a18cc

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -1435,7 +1435,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);
		@@ -1469,7 +1470,8 @@ static int pp_set_asic_baco_state(void *handle, int state)
		if (!hwmgr)
		return -EINVAL;

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

		mutex_lock(&hwmgr->smu_lock);

Admin message