drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs
Otherwise, the error message prompted will confuse user.
--- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +18 -5
@@ -3476,18 +3476,31 @@ static int smu7_get_pp_table_entry(struct pp_hwmgr *hwmgr,static int smu7_get_gpu_power (struct pp_hwmgr *hwmgr,u32 *query) { +struct amdgpu_device *adev = hwmgr->adev;int i;u32 tmp =0 ;if (!query)return -EINVAL ; -smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetCurrPkgPwr,0 ); - tmp =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); - *query = tmp; +/* +* PPSMC_MSG_GetCurrPkgPwr is not supported on: +* - Hawaii +* - Bonaire +* - Fiji +* - Tonga +*/ +if ((adev->asic_type !=CHIP_HAWAII ) && + (adev->asic_type !=CHIP_BONAIRE ) && + (adev->asic_type !=CHIP_FIJI ) && + (adev->asic_type !=CHIP_TONGA )) { +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetCurrPkgPwr,0 ); + tmp =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); + *query = tmp; -if (tmp !=0 ) -return 0 ; +if (tmp !=0 ) +return 0 ; + }smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PmStatusLogStart); cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,
Signature · 6 lines
2.24.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): [email protected]
Deucher, Alexander
Acked-by________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Evan Quan <[email protected]>
Sent: Thursday, November 14, 2019 2:33 AM
To: [email protected] <[email protected]>
Cc: Quan, Evan <[email protected]>
Subject: [PATCH] drm/amd/powerplay: issue no PPSMC_MSG_GetCurrPkgPwr on unsupported ASICs
Otherwise, the error message prompted will confuse user.
--- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 23 +++++++++++++++---- 1 file changed, 18 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +18 -5
@@ -3476,18 +3476,31 @@ static int smu7_get_pp_table_entry(struct pp_hwmgr *hwmgr,static int smu7_get_gpu_power (struct pp_hwmgr *hwmgr,u32 *query) { +struct amdgpu_device *adev = hwmgr->adev;int i;u32 tmp =0 ;if (!query)return -EINVAL ; -smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetCurrPkgPwr,0 ); - tmp =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); - *query = tmp; +/* +* PPSMC_MSG_GetCurrPkgPwr is not supported on: +* - Hawaii +* - Bonaire +* - Fiji +* - Tonga +*/ +if ((adev->asic_type !=CHIP_HAWAII ) && + (adev->asic_type !=CHIP_BONAIRE ) && + (adev->asic_type !=CHIP_FIJI ) && + (adev->asic_type !=CHIP_TONGA )) { +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetCurrPkgPwr,0 ); + tmp =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); + *query = tmp; -if (tmp !=0 ) -return 0 ; +if (tmp !=0 ) +return 0 ; + }smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PmStatusLogStart); cgs_write_ind_register(hwmgr->device, CGS_IND_REG__SMC,
--
2.24.0
_______________________________________________
amd-gfx mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx