drm/amd/pp: Add error handling when smu return failed on Vega10.
Subsystems (2)
PATCH 1/1 drm/amd/pp: Add error handling when smu return failed on Vega10.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +19 -16
@@ -3945,28 +3945,31 @@ static int vega10_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : - ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentGfxclkIndex); -if (!ret) { +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentGfxclkIndex);vega10_read_arg_from_smc (hwmgr, &sclk_idx); - *((uint32_t *)value) = dpm_table->gfx_table.dpm_levels[sclk_idx].value; - *size =4 ; +if (sclk_idx < dpm_table->gfx_table.count) { + *((uint32_t *)value) = dpm_table->gfx_table.dpm_levels[sclk_idx].value; + *size =4 ; + }else { + ret = -EINVAL ; + } }break ;case AMDGPU_PP_SENSOR_GFX_MCLK : - ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex); -if (!ret) { -vega10_read_arg_from_smc (hwmgr, &mclk_idx); - *((uint32_t *)value) = dpm_table->mem_table.dpm_levels[mclk_idx].value; - *size =4 ; - } +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex); +vega10_read_arg_from_smc (hwmgr, &mclk_idx); +if (mclk_idx < dpm_table->gfx_table.count) { + *((uint32_t *)value) = dpm_table->mem_table.dpm_levels[mclk_idx].value; + *size =4 ; + }else { + ret = -EINVAL ; + }break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetAverageGfxActivity,0 ); -if (!ret) { -vega10_read_arg_from_smc (hwmgr, &activity_percent); - *((uint32_t *)value) = activity_percent >100 ?100 : activity_percent; - *size =4 ; - } +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetAverageGfxActivity,0 ); +vega10_read_arg_from_smc (hwmgr, &activity_percent); + *((uint32_t *)value) = activity_percent >100 ?100 : activity_percent; + *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_TEMP : *((uint32_t *)value) =vega10_thermal_get_temperature (hwmgr);
Signature · 6 lines
1.9.1 _______________________________________________ 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): 1518324770-22051-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-byPlease include a commit message. E.g.,
Clamp the clock index to a valid range when reading it back.
Or something like that. With that fixed:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Saturday, February 10, 2018 11:52:50 PM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/pp: Add error handling when smu return failed on Vega10.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 35 ++++++++++++---------- 1 file changed, 19 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +19 -16
@@ -3945,28 +3945,31 @@ static int vega10_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : - ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentGfxclkIndex); -if (!ret) { +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentGfxclkIndex);vega10_read_arg_from_smc (hwmgr, &sclk_idx); - *((uint32_t *)value) = dpm_table->gfx_table.dpm_levels[sclk_idx].value; - *size =4 ; +if (sclk_idx < dpm_table->gfx_table.count) { + *((uint32_t *)value) = dpm_table->gfx_table.dpm_levels[sclk_idx].value; + *size =4 ; + }else { + ret = -EINVAL ; + } }break ;case AMDGPU_PP_SENSOR_GFX_MCLK : - ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex); -if (!ret) { -vega10_read_arg_from_smc (hwmgr, &mclk_idx); - *((uint32_t *)value) = dpm_table->mem_table.dpm_levels[mclk_idx].value; - *size =4 ; - } +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex); +vega10_read_arg_from_smc (hwmgr, &mclk_idx); +if (mclk_idx < dpm_table->gfx_table.count) { + *((uint32_t *)value) = dpm_table->mem_table.dpm_levels[mclk_idx].value; + *size =4 ; + }else { + ret = -EINVAL ; + }break ;case AMDGPU_PP_SENSOR_GPU_LOAD : - ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetAverageGfxActivity,0 ); -if (!ret) { -vega10_read_arg_from_smc (hwmgr, &activity_percent); - *((uint32_t *)value) = activity_percent >100 ?100 : activity_percent; - *size =4 ; - } +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetAverageGfxActivity,0 ); +vega10_read_arg_from_smc (hwmgr, &activity_percent); + *((uint32_t *)value) = activity_percent >100 ?100 : activity_percent; + *size =4 ;break ;case AMDGPU_PP_SENSOR_GPU_TEMP : *((uint32_t *)value) =vega10_thermal_get_temperature (hwmgr);
--
1.9.1
_______________________________________________
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