drm/amd/pp: Honour DC's clock limits on Rv
Subsystems (2)
PATCH 1/2 drm/amd/pp: Honour DC's clock limits on Rv
Honour display's request for min engine clock/memory clock.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 25 +++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +17 -8
@@ -552,6 +552,8 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, {struct smu10_hwmgr *data = hwmgr->backend;struct amdgpu_device *adev = hwmgr->adev; +uint32_t min_sclk = hwmgr->display_config->min_core_set_clock; +uint32_t min_mclk = hwmgr->display_config->min_mem_set_clock/100 ;if (hwmgr->smu_version <0x1E3700 ) {pr_info ("smu firmware version too old, can not set dpm level\n" );
@@ -563,6 +565,13 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, (adev->rev_id >= 8))return 0 ; +if (min_sclk < data->gfx_min_freq_limit) + min_sclk = data->gfx_min_freq_limit; + + min_sclk /=100 ;/* transfer 10KHz to MHz */ +if (min_mclk < data->clock_table.FClocks[0 ].Freq) + min_mclk = data->clock_table.FClocks[0 ].Freq; +switch (level) {case AMD_DPM_FORCED_LEVEL_HIGH :case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK :
@@ -595,18 +604,18 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - data->gfx_min_freq_limit/100 ); + min_sclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, - data->gfx_min_freq_limit/100 ); + min_sclk);break ;case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD : smum_send_msg_to_smc_with_parameter(hwmgr,
@@ -638,12 +647,12 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,case AMD_DPM_FORCED_LEVEL_AUTO :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - data->gfx_min_freq_limit/100 ); + min_sclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, hwmgr->display_config->num_display >3 ?SMU10_UMD_PSTATE_PEAK_FCLK : -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk); smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetHardMinSocclkByFreq,
@@ -674,10 +683,10 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, data->gfx_min_freq_limit/100);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
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): 1537276274-3331-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/2 drm/amd/pp: Return error immediately if load firmware failed
this can avoid hard hang and be useful for debug.
--- drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +6 -4
@@ -724,11 +724,13 @@ static int smu8_start_smu(struct pp_hwmgr *hwmgr)if (hwmgr->chip_id ==CHIP_STONEY ) fw_to_check &= ~(UCODE_ID_SDMA1_MASK |UCODE_ID_CP_MEC_JT2_MASK ); - ret =smu8_request_smu_load_fw (hwmgr); -if (ret) -pr_err ("SMU firmware load failed\n" ); +smu8_request_smu_load_fw (hwmgr); -smu8_check_fw_load_finish (hwmgr, fw_to_check); + ret =smu8_check_fw_load_finish (hwmgr, fw_to_check); +if (ret) { +pr_err ("SMU firmware load failed\n" ); +return ret; + } ret =smu8_load_mec_firmware (hwmgr);if (ret)
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-bySeries is:
________________________________
From: amd-gfx <amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org> on behalf of Rex Zhu <[email protected]>
Sent: Tuesday, September 18, 2018 9:11:13 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 1/2] drm/amd/pp: Honour DC's clock limits on Rv
Honour display's request for min engine clock/memory clock.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 25 +++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +17 -8
@@ -552,6 +552,8 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, {struct smu10_hwmgr *data = hwmgr->backend;struct amdgpu_device *adev = hwmgr->adev; +uint32_t min_sclk = hwmgr->display_config->min_core_set_clock; +uint32_t min_mclk = hwmgr->display_config->min_mem_set_clock/100 ;if (hwmgr->smu_version <0x1E3700 ) {pr_info ("smu firmware version too old, can not set dpm level\n" );
@@ -563,6 +565,13 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, (adev->rev_id >= 8))return 0 ; +if (min_sclk < data->gfx_min_freq_limit) + min_sclk = data->gfx_min_freq_limit; + + min_sclk /=100 ;/* transfer 10KHz to MHz */ +if (min_mclk < data->clock_table.FClocks[0 ].Freq) + min_mclk = data->clock_table.FClocks[0 ].Freq; +switch (level) {case AMD_DPM_FORCED_LEVEL_HIGH :case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK :
@@ -595,18 +604,18 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - data->gfx_min_freq_limit/100 ); + min_sclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, - data->gfx_min_freq_limit/100 ); + min_sclk);break ;case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD : smum_send_msg_to_smc_with_parameter(hwmgr,
@@ -638,12 +647,12 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,case AMD_DPM_FORCED_LEVEL_AUTO :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - data->gfx_min_freq_limit/100 ); + min_sclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, hwmgr->display_config->num_display >3 ?SMU10_UMD_PSTATE_PEAK_FCLK : -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk); smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetHardMinSocclkByFreq,
@@ -674,10 +683,10 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr, data->gfx_min_freq_limit/100);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_MIN_FCLK ); + min_mclk);break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
--
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