drm/amd/powerplay: avoid calling CI specific SMU message implemention
Subsystems (2)
PATCH 1/9 drm/amd/powerplay: avoid calling CI specific SMU message implemention
Prepare for coming lock protection for SMU message issuing.
--- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +2 -2
@@ -2881,7 +2881,7 @@ static int ci_update_uvd_smc_table(struct pp_hwmgr *hwmgr)if (hwmgr->dpm_level & profile_mode_mask || !PP_CAP (PHM_PlatformCaps_UVDDPM))break ; } -ci_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_UVDDPM_SetEnabledMask, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_UVDDPM_SetEnabledMask, data->dpm_level_enable_mask.uvd_dpm_enable_mask);return 0 ;
@@ -2912,7 +2912,7 @@ static int ci_update_vce_smc_table(struct pp_hwmgr *hwmgr)if (hwmgr->dpm_level & profile_mode_mask || !PP_CAP (PHM_PlatformCaps_VCEDPM))break ; } -ci_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_VCEDPM_SetEnabledMask, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_VCEDPM_SetEnabledMask, data->dpm_level_enable_mask.vce_dpm_enable_mask);return 0 ;
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/9 drm/amd/powerplay: avoid calling SMU7 specific SMU message implemention
Prepare for coming lock protection for SMU message issuing.
--- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 10 +++---- .../drm/amd/powerplay/hwmgr/smu7_thermal.c | 8 +++--- .../drm/amd/powerplay/smumgr/fiji_smumgr.c | 7 +++-- .../drm/amd/powerplay/smumgr/iceland_smumgr.c | 1 + .../amd/powerplay/smumgr/polaris10_smumgr.c | 3 ++- .../drm/amd/powerplay/smumgr/smu7_smumgr.c | 26 ++++++++----------- .../drm/amd/powerplay/smumgr/smu7_smumgr.h | 1 + .../drm/amd/powerplay/smumgr/tonga_smumgr.c | 1 + .../drm/amd/powerplay/smumgr/vegam_smumgr.c | 1 + 9 files changed, 29 insertions(+), 29 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +5 -5
@@ -3496,7 +3496,7 @@ static int smu7_get_gpu_power(struct pp_hwmgr *hwmgr, u32 *query) (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); + tmp =smum_get_argument (hwmgr); *query = tmp;if (tmp !=0 )
@@ -3535,13 +3535,13 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK :smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency); - sclk =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); + sclk =smum_get_argument (hwmgr); *((uint32_t *)value) = sclk; *size =4 ;return 0 ;case AMDGPU_PP_SENSOR_GFX_MCLK :smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency); - mclk =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); + mclk =smum_get_argument (hwmgr); *((uint32_t *)value) = mclk; *size =4 ;return 0 ;
@@ -4455,7 +4455,7 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,switch (type) {case PP_SCLK :smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency); - clock =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); + clock =smum_get_argument (hwmgr);for (i =0 ; i < sclk_table->count; i++) {if (clock > sclk_table->dpm_levels[i].value)
@@ -4471,7 +4471,7 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,break ;case PP_MCLK :smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency); - clock =cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); + clock =smum_get_argument (hwmgr);for (i =0 ; i < mclk_table->count; i++) {if (clock > mclk_table->dpm_levels[i].value)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c +4 -4
@@ -151,8 +151,8 @@ int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr)int result;if (PP_CAP (PHM_PlatformCaps_ODFuzzyFanControlSupport)) { -cgs_write_register (hwmgr->device, mmSMC_MSG_ARG_0,FAN_CONTROL_FUZZY ); - result =smum_send_msg_to_smc (hwmgr, PPSMC_StartFanControl); + result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_StartFanControl, +FAN_CONTROL_FUZZY );if (PP_CAP (PHM_PlatformCaps_FanSpeedInTableIsRPM)) hwmgr->hwmgr_func->set_max_fan_rpm_output(hwmgr,
@@ -164,8 +164,8 @@ int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr) advanceFanControlParameters.usMaxFanPWM); } else { -cgs_write_register (hwmgr->device, mmSMC_MSG_ARG_0,FAN_CONTROL_TABLE ); - result =smum_send_msg_to_smc (hwmgr, PPSMC_StartFanControl); + result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_StartFanControl, +FAN_CONTROL_TABLE ); } if (!result && hwmgr->thermal_controller.
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +3 -4
@@ -137,9 +137,7 @@ static int fiji_start_smu_in_protection_mode(struct pp_hwmgr *hwmgr)PHM_WAIT_VFPF_INDIRECT_FIELD (hwmgr,SMC_IND ,RCU_UC_EVENTS ,INTERRUPTS_ENABLED ,1 ); -cgs_write_register (hwmgr->device, mmSMC_MSG_ARG_0,0x20000 ); -cgs_write_register (hwmgr->device, mmSMC_MESSAGE_0, PPSMC_MSG_Test); -PHM_WAIT_FIELD_UNEQUAL (hwmgr,SMC_RESP_0 ,SMC_RESP ,0 ); +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_Test,0x20000 );/* Wait for done bit to be set */ PHM_WAIT_VFPF_INDIRECT_FIELD_UNEQUAL(hwmgr, SMC_IND,
@@ -203,7 +201,7 @@ static int fiji_start_avfs_btc(struct pp_hwmgr *hwmgr)struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(hwmgr->smu_backend);if (0 != smu_data->avfs_btc_param) { -if (0 !=smu7_send_msg_to_smc_with_parameter (hwmgr, +if (0 !=smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_PerformBtc, smu_data->avfs_btc_param)) {pr_info ("[AVFS][Fiji_PerformBtc] PerformBTC SMU msg failed" ); result = -EINVAL ;
@@ -2649,6 +2647,7 @@ const struct pp_smumgr_func fiji_smu_funcs = { .request_smu_load_specific_fw = NULL, .send_msg_to_smc = &smu7_send_msg_to_smc, .send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter, + .get_argument = smu7_get_argument, .download_pptable_settings = NULL, .upload_pptable_settings = NULL, .update_smc_table = fiji_update_smc_table,
drivers/gpu/drm/amd/powerplay/smumgr/iceland_smumgr.c +1 -0
@@ -2669,6 +2669,7 @@ const struct pp_smumgr_func iceland_smu_funcs = { .request_smu_load_specific_fw = &iceland_request_smu_load_specific_fw, .send_msg_to_smc = &smu7_send_msg_to_smc, .send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter, + .get_argument = smu7_get_argument, .download_pptable_settings = NULL, .upload_pptable_settings = NULL, .get_offsetof = iceland_get_offsetof,
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +2 -1
@@ -99,7 +99,7 @@ static int polaris10_perform_btc(struct pp_hwmgr *hwmgr)struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(hwmgr->smu_backend);if (0 != smu_data->avfs_btc_param) { -if (0 !=smu7_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_PerformBtc, smu_data->avfs_btc_param)) { +if (0 !=smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_PerformBtc, smu_data->avfs_btc_param)) {pr_info ("[AVFS][SmuPolaris10_PerformBtc] PerformBTC SMU msg failed" ); result =-1 ; }
@@ -2565,6 +2565,7 @@ const struct pp_smumgr_func polaris10_smu_funcs = { .request_smu_load_specific_fw = NULL, .send_msg_to_smc = smu7_send_msg_to_smc, .send_msg_to_smc_with_parameter = smu7_send_msg_to_smc_with_parameter, + .get_argument = smu7_get_argument, .download_pptable_settings = NULL, .upload_pptable_settings = NULL, .update_smc_table = polaris10_update_smc_table,
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +11 -15
@@ -214,18 +214,14 @@ int smu7_send_msg_to_smc_with_parameter_without_waiting(struct pp_hwmgr *hwmgr,return smu7_send_msg_to_smc_without_waiting (hwmgr, msg); } -int smu7_send_msg_to_smc_offset (struct pp_hwmgr *hwmgr) +uint32_t smu7_get_argument (struct pp_hwmgr *hwmgr) { -cgs_write_register (hwmgr->device, mmSMC_MSG_ARG_0,0x20000 ); - -cgs_write_register (hwmgr->device, mmSMC_MESSAGE_0, PPSMC_MSG_Test); - -PHM_WAIT_FIELD_UNEQUAL (hwmgr,SMC_RESP_0 ,SMC_RESP ,0 ); - -if (1 !=PHM_READ_FIELD (hwmgr->device,SMC_RESP_0 ,SMC_RESP )) -pr_info ("Failed to send Message.\n" ); +return cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0); +} -return 0 ; +int smu7_send_msg_to_smc_offset (struct pp_hwmgr *hwmgr) +{ +return smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_Test,0x20000 ); }enum cgs_ucode_id smu7_convert_fw_type_to_cgs (uint32_t fw_type)
@@ -353,10 +349,10 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr)if (hwmgr->chip_id >CHIP_TOPAZ ) {/* add support for Topaz */ if (hwmgr->not_vf) { -smu7_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr,PPSMC_MSG_SMU_DRAM_ADDR_HI ,upper_32_bits (smu_data->smu_buffer.mc_addr)); -smu7_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr,PPSMC_MSG_SMU_DRAM_ADDR_LO ,lower_32_bits (smu_data->smu_buffer.mc_addr)); }
@@ -423,10 +419,10 @@ int smu7_request_smu_load_fw(struct pp_hwmgr *hwmgr) }memcpy_toio (smu_data->header_buffer.kaddr, smu_data->toc,sizeof (struct SMU_DRAMData_TOC )); -smu7_send_msg_to_smc_with_parameter (hwmgr,PPSMC_MSG_DRV_DRAM_ADDR_HI ,upper_32_bits (smu_data->header_buffer.mc_addr)); -smu7_send_msg_to_smc_with_parameter (hwmgr,PPSMC_MSG_DRV_DRAM_ADDR_LO ,lower_32_bits (smu_data->header_buffer.mc_addr)); +smum_send_msg_to_smc_with_parameter (hwmgr,PPSMC_MSG_DRV_DRAM_ADDR_HI ,upper_32_bits (smu_data->header_buffer.mc_addr)); +smum_send_msg_to_smc_with_parameter (hwmgr,PPSMC_MSG_DRV_DRAM_ADDR_LO ,lower_32_bits (smu_data->header_buffer.mc_addr)); -smu7_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_LoadUcodes, fw_to_load); +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_LoadUcodes, fw_to_load); r =smu7_check_fw_load_finish (hwmgr, fw_to_load);if (!r)
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h +1 -0
@@ -65,6 +65,7 @@ int smu7_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr, uint16_t msg, uint32_t parameter);int smu7_send_msg_to_smc_with_parameter_without_waiting (struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter); +uint32_t smu7_get_argument (struct pp_hwmgr *hwmgr);int smu7_send_msg_to_smc_offset (struct pp_hwmgr *hwmgr);enum cgs_ucode_id smu7_convert_fw_type_to_cgs (uint32_t fw_type);
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +1 -0
@@ -3248,6 +3248,7 @@ const struct pp_smumgr_func tonga_smu_funcs = { .request_smu_load_specific_fw = NULL, .send_msg_to_smc = &smu7_send_msg_to_smc, .send_msg_to_smc_with_parameter = &smu7_send_msg_to_smc_with_parameter, + .get_argument = smu7_get_argument, .download_pptable_settings = NULL, .upload_pptable_settings = NULL, .update_smc_table = tonga_update_smc_table,
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +1 -0
@@ -2279,6 +2279,7 @@ const struct pp_smumgr_func vegam_smu_funcs = { .request_smu_load_specific_fw = NULL, .send_msg_to_smc = smu7_send_msg_to_smc, .send_msg_to_smc_with_parameter = smu7_send_msg_to_smc_with_parameter, + .get_argument = smu7_get_argument, .process_firmware_header = vegam_process_firmware_header, .is_dpm_running = vegam_is_dpm_running, .get_mac_definition = vegam_get_mac_definition,
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/9 drm/amd/powerpaly: drop unused APIs
In reply to Evan QuanDrop unused smu7 message APIs.
--- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 14 -------------- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 3 --- 2 files changed, 17 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +0 -14
@@ -191,13 +191,6 @@ int smu7_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg)return 0 ; } -int smu7_send_msg_to_smc_without_waiting (struct pp_hwmgr *hwmgr,uint16_t msg) -{ -cgs_write_register (hwmgr->device, mmSMC_MESSAGE_0, msg); - -return 0 ; -} -int smu7_send_msg_to_smc_with_parameter (struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter) {PHM_WAIT_FIELD_UNEQUAL (hwmgr,SMC_RESP_0 ,SMC_RESP ,0 );
@@ -207,13 +200,6 @@ int smu7_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr, uint16_t msg, uireturn smu7_send_msg_to_smc (hwmgr, msg); } -int smu7_send_msg_to_smc_with_parameter_without_waiting (struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter) -{ -cgs_write_register (hwmgr->device, mmSMC_MSG_ARG_0, parameter); - -return smu7_send_msg_to_smc_without_waiting (hwmgr, msg); -} -uint32_t smu7_get_argument (struct pp_hwmgr *hwmgr) {return cgs_read_register (hwmgr->device, mmSMC_MSG_ARG_0);
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h +0 -3
@@ -60,11 +60,8 @@ int smu7_copy_bytes_to_smc(struct pp_hwmgr *hwmgr, uint32_t smc_start_address,int smu7_program_jump_on_start (struct pp_hwmgr *hwmgr);bool smu7_is_smc_ram_running (struct pp_hwmgr *hwmgr);int smu7_send_msg_to_smc (struct pp_hwmgr *hwmgr,uint16_t msg); -int smu7_send_msg_to_smc_without_waiting (struct pp_hwmgr *hwmgr,uint16_t msg);int smu7_send_msg_to_smc_with_parameter (struct pp_hwmgr *hwmgr,uint16_t msg,uint32_t parameter); -int smu7_send_msg_to_smc_with_parameter_without_waiting (struct pp_hwmgr *hwmgr, -uint16_t msg,uint32_t parameter);uint32_t smu7_get_argument (struct pp_hwmgr *hwmgr);int smu7_send_msg_to_smc_offset (struct pp_hwmgr *hwmgr);
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/9 drm/amd/powerplay: avoid calling SMU8 specific SMU message implemention
In reply to Evan QuanPrepare for coming lock protection for SMU message issuing.
--- .../gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 2 +- .../drm/amd/powerplay/smumgr/smu8_smumgr.c | 30 +++++++++---------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +1 -1
@@ -1755,7 +1755,7 @@ static int smu8_read_sensor(struct pp_hwmgr *hwmgr, int idx,case AMDGPU_PP_SENSOR_GPU_LOAD : result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetAverageGraphicsActivity);if (0 == result) { - activity_percent =cgs_read_register (hwmgr->device, mmSMU_MP1_SRBM2P_ARG_0); + activity_percent =smum_get_argument (hwmgr); activity_percent = activity_percent >100 ?100 : activity_percent; }else { activity_percent =50 ;
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +15 -15
@@ -610,18 +610,18 @@ static int smu8_download_pptable_settings(struct pp_hwmgr *hwmgr, void **table) *table = (struct SMU8_Fusion_ClkTable *)smu8_smu->scratch_buffer[i].kaddr; -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetClkTableAddrHi,upper_32_bits (smu8_smu->scratch_buffer[i].mc_addr)); -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetClkTableAddrLo,lower_32_bits (smu8_smu->scratch_buffer[i].mc_addr)); -smu8_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu->toc_entry_clock_table); -smu8_send_msg_to_smc (hwmgr, PPSMC_MSG_ClkTableXferToDram); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ClkTableXferToDram);return 0 ; }
@@ -637,18 +637,18 @@ static int smu8_upload_pptable_settings(struct pp_hwmgr *hwmgr)break ; } -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetClkTableAddrHi,upper_32_bits (smu8_smu->scratch_buffer[i].mc_addr)); -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetClkTableAddrLo,lower_32_bits (smu8_smu->scratch_buffer[i].mc_addr)); -smu8_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu->toc_entry_clock_table); -smu8_send_msg_to_smc (hwmgr, PPSMC_MSG_ClkTableXferToSmu); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ClkTableXferToSmu);return 0 ; }
@@ -671,23 +671,23 @@ static int smu8_request_smu_load_fw(struct pp_hwmgr *hwmgr)smu8_write_smc_sram_dword (hwmgr, smc_address,0 , smc_address+4 ); -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DriverDramAddrHi,upper_32_bits (smu8_smu->toc_buffer.mc_addr)); -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DriverDramAddrLo,lower_32_bits (smu8_smu->toc_buffer.mc_addr)); -smu8_send_msg_to_smc (hwmgr, PPSMC_MSG_InitJobs); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_InitJobs); -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu->toc_entry_aram); -smu8_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu->toc_entry_power_profiling_index); -smu8_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ExecuteJob, smu8_smu->toc_entry_initialize_index);
@@ -862,7 +862,7 @@ static bool smu8_dpm_check_smu_features(struct pp_hwmgr *hwmgr,int result;unsigned long features; - result =smu8_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetFeatureStatus,0 ); + result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_GetFeatureStatus,0 );if (result ==0 ) { features =smum_get_argument (hwmgr);if (features & check_feature)
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/9 drm/amd/powerplay: avoid calling SMU9 specific SMU message implemention
In reply to Evan QuanPrepare for coming lock protection for SMU message issuing.
--- .../drm/amd/powerplay/smumgr/vega10_smumgr.c | 24 +++++++------- .../drm/amd/powerplay/smumgr/vega12_smumgr.c | 32 +++++++++---------- 2 files changed, 28 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +12 -12
@@ -47,13 +47,13 @@ static int vega10_copy_table_from_smc(struct pp_hwmgr *hwmgr, "Invalid SMU Table version!", return -EINVAL);PP_ASSERT_WITH_CODE (priv->smu_tables.entry[table_id].size !=0 ,"Invalid SMU Table Length!" , return -EINVAL ); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableSmu2Dram, priv->smu_tables.entry[table_id].table_id);
@@ -90,13 +90,13 @@ static int vega10_copy_table_to_smc(struct pp_hwmgr *hwmgr,amdgpu_asic_flush_hdp (adev,NULL ); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableDram2Smu, priv->smu_tables.entry[table_id].table_id);
@@ -127,8 +127,8 @@ int vega10_get_enabled_smc_features(struct pp_hwmgr *hwmgr,if (features_enabled ==NULL )return -EINVAL ; -smu9_send_msg_to_smc (hwmgr, PPSMC_MSG_GetEnabledSmuFeatures); - *features_enabled =smu9_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetEnabledSmuFeatures); + *features_enabled =smum_get_argument (hwmgr);return 0 ; }
@@ -150,10 +150,10 @@ static int vega10_set_tools_address(struct pp_hwmgr *hwmgr)struct vega10_smumgr *priv = hwmgr->smu_backend;if (priv->smu_tables.entry[TOOLSTABLE ].mc_addr) { -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetToolsDramAddrHigh,upper_32_bits (priv->smu_tables.entry[TOOLSTABLE ].mc_addr)); -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetToolsDramAddrLow,lower_32_bits (priv->smu_tables.entry[TOOLSTABLE ].mc_addr)); }
@@ -167,11 +167,11 @@ static int vega10_verify_smc_interface(struct pp_hwmgr *hwmgr)uint32_t dev_id;uint32_t rev_id; -PP_ASSERT_WITH_CODE (!smu9_send_msg_to_smc (hwmgr, +PP_ASSERT_WITH_CODE (!smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetDriverIfVersion),"Attempt to get SMC IF Version Number Failed!" , return -EINVAL ); - smc_driver_if_version =smu9_get_argument (hwmgr); + smc_driver_if_version =smum_get_argument (hwmgr); dev_id = adev->pdev->device; rev_id = adev->pdev->revision;
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +16 -16
@@ -50,16 +50,16 @@ static int vega12_copy_table_from_smc(struct pp_hwmgr *hwmgr, "Invalid SMU Table version!", return -EINVAL);PP_ASSERT_WITH_CODE (priv->smu_tables.entry[table_id].size !=0 ,"Invalid SMU Table Length!" , return -EINVAL ); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr)) ==0 ,"[CopyTableFromSMC] Attempt to Set Dram Addr High Failed!" , return -EINVAL ); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr)) ==0 ,"[CopyTableFromSMC] Attempt to Set Dram Addr Low Failed!" , return -EINVAL ); - PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr, + PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_TransferTableSmu2Dram, table_id) == 0, "[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!",
@@ -98,17 +98,17 @@ static int vega12_copy_table_to_smc(struct pp_hwmgr *hwmgr,amdgpu_asic_flush_hdp (adev,NULL ); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr)) ==0 ,"[CopyTableToSMC] Attempt to Set Dram Addr High Failed!" , return -EINVAL;); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr)) ==0 ,"[CopyTableToSMC] Attempt to Set Dram Addr Low Failed!" , return -EINVAL ); - PP_ASSERT_WITH_CODE(smu9_send_msg_to_smc_with_parameter(hwmgr, + PP_ASSERT_WITH_CODE(smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_TransferTableDram2Smu, table_id) == 0, "[CopyTableToSMC] Attempt to Transfer Table To SMU Failed!",
@@ -126,20 +126,20 @@ int vega12_enable_smc_features(struct pp_hwmgr *hwmgr, smu_features_high = (uint32_t )((feature_mask &SMU_FEATURES_HIGH_MASK ) >>SMU_FEATURES_HIGH_SHIFT );if (enable) { -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnableSmuFeaturesLow, smu_features_low) ==0 ,"[EnableDisableSMCFeatures] Attempt to enable SMU features Low failed!" , return -EINVAL ); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnableSmuFeaturesHigh, smu_features_high) ==0 ,"[EnableDisableSMCFeatures] Attempt to enable SMU features High failed!" , return -EINVAL ); }else { -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DisableSmuFeaturesLow, smu_features_low) ==0 ,"[EnableDisableSMCFeatures] Attempt to disable SMU features Low failed!" , return -EINVAL ); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DisableSmuFeaturesHigh, smu_features_high) ==0 ,"[EnableDisableSMCFeatures] Attempt to disable SMU features High failed!" , return -EINVAL );
@@ -156,17 +156,17 @@ int vega12_get_enabled_smc_features(struct pp_hwmgr *hwmgr,if (features_enabled ==NULL )return -EINVAL ; -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetEnabledSmuFeaturesLow) ==0 ,"[GetEnabledSMCFeatures] Attempt to get SMU features Low failed!" , return -EINVAL ); - smc_features_low =smu9_get_argument (hwmgr); + smc_features_low =smum_get_argument (hwmgr); -PP_ASSERT_WITH_CODE (smu9_send_msg_to_smc (hwmgr, +PP_ASSERT_WITH_CODE (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetEnabledSmuFeaturesHigh) ==0 ,"[GetEnabledSMCFeatures] Attempt to get SMU features High failed!" , return -EINVAL ); - smc_features_high =smu9_get_argument (hwmgr); + smc_features_high =smum_get_argument (hwmgr); *features_enabled = ((((uint64_t )smc_features_low <<SMU_FEATURES_LOW_SHIFT ) &SMU_FEATURES_LOW_MASK ) | (((uint64_t )smc_features_high <<SMU_FEATURES_HIGH_SHIFT ) &SMU_FEATURES_HIGH_MASK ));
@@ -192,10 +192,10 @@ static int vega12_set_tools_address(struct pp_hwmgr *hwmgr) (struct vega12_smumgr *)(hwmgr->smu_backend);if (priv->smu_tables.entry[TABLE_PMSTATUSLOG ].mc_addr) { -if (!smu9_send_msg_to_smc_with_parameter (hwmgr, +if (!smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetToolsDramAddrHigh,upper_32_bits (priv->smu_tables.entry[TABLE_PMSTATUSLOG ].mc_addr))) -smu9_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetToolsDramAddrLow,lower_32_bits (priv->smu_tables.entry[TABLE_PMSTATUSLOG ].mc_addr)); }
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 6/9 drm/amd/powerplay: avoid calling SMU10 specific SMU message implemention
In reply to Evan QuanPrepare for coming lock protection for SMU message issuing.
--- .../drm/amd/powerplay/smumgr/smu10_smumgr.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +9 -9
@@ -126,13 +126,13 @@ static int smu10_copy_table_from_smc(struct pp_hwmgr *hwmgr, "Invalid SMU Table version!", return -EINVAL;);PP_ASSERT_WITH_CODE (priv->smu_tables.entry[table_id].size !=0 , "Invalid SMU Table Length!", return -EINVAL;); -smu10_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu10_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu10_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableSmu2Dram, priv->smu_tables.entry[table_id].table_id);
@@ -164,13 +164,13 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr,amdgpu_asic_flush_hdp (adev,NULL ); -smu10_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu10_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr)); -smu10_send_msg_to_smc_with_parameter (hwmgr, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableDram2Smu, priv->smu_tables.entry[table_id].table_id);
@@ -181,9 +181,9 @@ static int smu10_verify_smc_interface(struct pp_hwmgr *hwmgr) {uint32_t smc_driver_if_version; -smu10_send_msg_to_smc (hwmgr, +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetDriverIfVersion); - smc_driver_if_version =smu10_read_arg_from_smc (hwmgr); + smc_driver_if_version =smum_get_argument (hwmgr);if ((smc_driver_if_version !=SMU10_DRIVER_IF_VERSION ) && (smc_driver_if_version !=SMU10_DRIVER_IF_VERSION +1 )) {
@@ -218,7 +218,7 @@ static int smu10_start_smu(struct pp_hwmgr *hwmgr)struct amdgpu_device *adev = hwmgr->adev;smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetSmuVersion); - hwmgr->smu_version =smu10_read_arg_from_smc (hwmgr); + hwmgr->smu_version =smum_get_argument (hwmgr); adev->pm.fw_version = hwmgr->smu_version >>8 ; if (adev->rev_id < 0x8 && adev->pdev->device != 0x15d8 &&
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 7/9 drm/amd/powerplay: avoid calling Vega20 specific SMU message implemention
In reply to Evan QuanPrepare for coming lock protection for SMU message issuing.
--- .../drm/amd/powerplay/smumgr/vega20_smumgr.c | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +24 -24
@@ -175,17 +175,17 @@ static int vega20_copy_table_from_smc(struct pp_hwmgr *hwmgr,PP_ASSERT_WITH_CODE (priv->smu_tables.entry[table_id].size !=0 ,"Invalid SMU Table Length!" , return -EINVAL ); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr))) ==0 ,"[CopyTableFromSMC] Attempt to Set Dram Addr High Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr))) ==0 ,"[CopyTableFromSMC] Attempt to Set Dram Addr Low Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableSmu2Dram, table_id)) ==0 ,"[CopyTableFromSMC] Attempt to Transfer Table From SMU Failed!" , return ret);
@@ -224,17 +224,17 @@ static int vega20_copy_table_to_smc(struct pp_hwmgr *hwmgr,amdgpu_asic_flush_hdp (adev,NULL ); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[table_id].mc_addr))) ==0 ,"[CopyTableToSMC] Attempt to Set Dram Addr High Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[table_id].mc_addr))) ==0 ,"[CopyTableToSMC] Attempt to Set Dram Addr Low Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableDram2Smu, table_id)) ==0 ,"[CopyTableToSMC] Attempt to Transfer Table To SMU Failed!" , return ret);
@@ -255,17 +255,17 @@ int vega20_set_activity_monitor_coeff(struct pp_hwmgr *hwmgr,amdgpu_asic_flush_hdp (adev,NULL ); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 ,"[SetActivityMonitor] Attempt to Set Dram Addr High Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 ,"[SetActivityMonitor] Attempt to Set Dram Addr Low Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_TransferTableDram2Smu,TABLE_ACTIVITY_MONITOR_COEFF | (workload_type <<16 ))) ==0 ,"[SetActivityMonitor] Attempt to Transfer Table To SMU Failed!" , return ret);
@@ -281,17 +281,17 @@ int vega20_get_activity_monitor_coeff(struct pp_hwmgr *hwmgr,struct amdgpu_device *adev = hwmgr->adev;int ret =0 ; -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 ,"[GetActivityMonitor] Attempt to Set Dram Addr High Failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrLow,lower_32_bits (priv->smu_tables.entry[TABLE_ACTIVITY_MONITOR_COEFF ].mc_addr))) ==0 ,"[GetActivityMonitor] Attempt to Set Dram Addr Low Failed!" , return ret); - PP_ASSERT_WITH_CODE((ret = vega20_send_msg_to_smc_with_parameter(hwmgr, + PP_ASSERT_WITH_CODE((ret = smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_TransferTableSmu2Dram, TABLE_ACTIVITY_MONITOR_COEFF | (workload_type << 16))) == 0, "[GetActivityMonitor] Attempt to Transfer Table From SMU Failed!",
@@ -316,20 +316,20 @@ int vega20_enable_smc_features(struct pp_hwmgr *hwmgr, smu_features_high = (uint32_t )((feature_mask &SMU_FEATURES_HIGH_MASK ) >>SMU_FEATURES_HIGH_SHIFT );if (enable) { -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnableSmuFeaturesLow, smu_features_low)) ==0 ,"[EnableDisableSMCFeatures] Attempt to enable SMU features Low failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnableSmuFeaturesHigh, smu_features_high)) ==0 ,"[EnableDisableSMCFeatures] Attempt to enable SMU features High failed!" , return ret); }else { -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DisableSmuFeaturesLow, smu_features_low)) ==0 ,"[EnableDisableSMCFeatures] Attempt to disable SMU features Low failed!" , return ret); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DisableSmuFeaturesHigh, smu_features_high)) ==0 ,"[EnableDisableSMCFeatures] Attempt to disable SMU features High failed!" , return ret);
@@ -347,16 +347,16 @@ int vega20_get_enabled_smc_features(struct pp_hwmgr *hwmgr,if (features_enabled ==NULL )return -EINVAL ; -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetEnabledSmuFeaturesLow)) ==0 ,"[GetEnabledSMCFeatures] Attempt to get SMU features Low failed!" , return ret); - smc_features_low =vega20_get_argument (hwmgr); -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc (hwmgr, + smc_features_low =smum_get_argument (hwmgr); +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetEnabledSmuFeaturesHigh)) ==0 ,"[GetEnabledSMCFeatures] Attempt to get SMU features High failed!" , return ret); - smc_features_high =vega20_get_argument (hwmgr); + smc_features_high =smum_get_argument (hwmgr); *features_enabled = ((((uint64_t )smc_features_low <<SMU_FEATURES_LOW_SHIFT ) &SMU_FEATURES_LOW_MASK ) | (((uint64_t )smc_features_high <<SMU_FEATURES_HIGH_SHIFT ) &SMU_FEATURES_HIGH_MASK ));
@@ -371,11 +371,11 @@ static int vega20_set_tools_address(struct pp_hwmgr *hwmgr)int ret =0 ;if (priv->smu_tables.entry[TABLE_PMSTATUSLOG ].mc_addr) { - ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetToolsDramAddrHigh,upper_32_bits (priv->smu_tables.entry[TABLE_PMSTATUSLOG ].mc_addr));if (!ret) - ret =vega20_send_msg_to_smc_with_parameter (hwmgr, + ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetToolsDramAddrLow,lower_32_bits (priv->smu_tables.entry[TABLE_PMSTATUSLOG ].mc_addr)); }
@@ -389,12 +389,12 @@ int vega20_set_pptable_driver_address(struct pp_hwmgr *hwmgr) (struct vega20_smumgr *)(hwmgr->smu_backend);int ret =0 ; -PP_ASSERT_WITH_CODE ((ret =vega20_send_msg_to_smc_with_parameter (hwmgr, +PP_ASSERT_WITH_CODE ((ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDriverDramAddrHigh,upper_32_bits (priv->smu_tables.entry[TABLE_PPTABLE ].mc_addr))) ==0 ,"[SetPPtabeDriverAddress] Attempt to Set Dram Addr High Failed!" , return ret); - PP_ASSERT_WITH_CODE((ret = vega20_send_msg_to_smc_with_parameter(hwmgr, + PP_ASSERT_WITH_CODE((ret = smum_send_msg_to_smc_with_parameter(hwmgr, PPSMC_MSG_SetDriverDramAddrLow, lower_32_bits(priv->smu_tables.entry[TABLE_PPTABLE].mc_addr))) == 0, "[SetPPtabeDriverAddress] Attempt to Set Dram Addr Low Failed!",
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 8/9 drm/amd/powerplay: unified interfaces for message issuing and response checking
In reply to Evan QuanThis can avoid potential race condition between them.
--- .../gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c | 165 +++++++++------- .../powerplay/hwmgr/smu7_clockpowergating.c | 61 +++--- .../gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 135 +++++++------ .../drm/amd/powerplay/hwmgr/smu7_powertune.c | 40 ++-- .../drm/amd/powerplay/hwmgr/smu7_thermal.c | 13 +- .../gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c | 157 +++++++++------ .../gpu/drm/amd/powerplay/hwmgr/smu_helper.c | 4 +- .../gpu/drm/amd/powerplay/hwmgr/vega10_baco.c | 2 +- .../drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 141 ++++++++------ .../amd/powerplay/hwmgr/vega10_powertune.c | 9 +- .../drm/amd/powerplay/hwmgr/vega10_thermal.c | 6 +- .../gpu/drm/amd/powerplay/hwmgr/vega12_baco.c | 2 +- .../drm/amd/powerplay/hwmgr/vega12_hwmgr.c | 149 +++++++------- .../drm/amd/powerplay/hwmgr/vega12_thermal.c | 7 +- .../gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 10 +- .../drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 181 ++++++++++-------- .../amd/powerplay/hwmgr/vega20_powertune.c | 6 +- .../drm/amd/powerplay/hwmgr/vega20_thermal.c | 7 +- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 7 +- .../gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 14 +- .../drm/amd/powerplay/smumgr/fiji_smumgr.c | 30 +-- .../amd/powerplay/smumgr/polaris10_smumgr.c | 30 +-- .../drm/amd/powerplay/smumgr/smu10_smumgr.c | 25 ++- .../drm/amd/powerplay/smumgr/smu7_smumgr.c | 22 ++- .../drm/amd/powerplay/smumgr/smu8_smumgr.c | 47 +++-- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 44 +++-- .../drm/amd/powerplay/smumgr/tonga_smumgr.c | 14 +- .../drm/amd/powerplay/smumgr/vega10_smumgr.c | 38 ++-- .../drm/amd/powerplay/smumgr/vega12_smumgr.c | 40 ++-- .../drm/amd/powerplay/smumgr/vega20_smumgr.c | 62 +++--- .../drm/amd/powerplay/smumgr/vegam_smumgr.c | 17 +- 31 files changed, 892 insertions(+), 593 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu10_hwmgr.c +101 -64
@@ -81,7 +81,7 @@ static int smu10_display_clock_voltage_request(struct pp_hwmgr *hwmgr,pr_info ("[DisplayClockVoltageRequest]Invalid Clock Type!" );return -EINVAL ; } -smum_send_msg_to_smc_with_parameter (hwmgr, msg, clk_freq); +smum_send_msg_to_smc_with_parameter (hwmgr, msg, clk_freq,NULL );return 0 ; }
@@ -214,7 +214,8 @@ static int smu10_set_min_deep_sleep_dcefclk(struct pp_hwmgr *hwmgr, uint32_t clo smu10_data->deep_sleep_dcefclk = clock;smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetMinDeepSleepDcefclk, - smu10_data->deep_sleep_dcefclk); + smu10_data->deep_sleep_dcefclk, +NULL ); }return 0 ; }
@@ -228,7 +229,8 @@ static int smu10_set_hard_min_dcefclk_by_freq(struct pp_hwmgr *hwmgr, uint32_t c smu10_data->dcf_actual_hard_min_freq = clock;smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinDcefclkByFreq, - smu10_data->dcf_actual_hard_min_freq); + smu10_data->dcf_actual_hard_min_freq, +NULL ); }return 0 ; }
@@ -242,7 +244,8 @@ static int smu10_set_hard_min_fclk_by_freq(struct pp_hwmgr *hwmgr, uint32_t cloc smu10_data->f_actual_hard_min_freq = clock;smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, - smu10_data->f_actual_hard_min_freq); + smu10_data->f_actual_hard_min_freq, +NULL ); }return 0 ; }
@@ -255,7 +258,8 @@ static int smu10_set_active_display_count(struct pp_hwmgr *hwmgr, uint32_t count smu10_data->num_active_display = count;smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetDisplayCount, - smu10_data->num_active_display); + smu10_data->num_active_display, +NULL ); }return 0 ;
@@ -278,7 +282,8 @@ static int smu10_init_power_gate_state(struct pp_hwmgr *hwmgr)if (adev->pg_flags &AMD_PG_SUPPORT_GFX_PG )return smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetGfxCGPG, - true); + true, +NULL );else return 0 ; }
@@ -324,7 +329,7 @@ static int smu10_disable_gfx_off(struct pp_hwmgr *hwmgr)struct amdgpu_device *adev = hwmgr->adev;if (adev->pm.pp_feature &PP_GFXOFF_MASK ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_DisableGfxOff); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_DisableGfxOff,NULL );/* confirm gfx is back to "on" state */ while (!smu10_is_gfx_on (hwmgr))
@@ -344,7 +349,7 @@ static int smu10_enable_gfx_off(struct pp_hwmgr *hwmgr)struct amdgpu_device *adev = hwmgr->adev;if (adev->pm.pp_feature &PP_GFXOFF_MASK ) -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_EnableGfxOff); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_EnableGfxOff,NULL );return 0 ; }
@@ -479,12 +484,10 @@ static int smu10_populate_clock_table(struct pp_hwmgr *hwmgr)smu10_get_clock_voltage_dependency_table (hwmgr, &pinfo->vdd_dep_on_phyclk,ARRAY_SIZE (VddPhyClk), &VddPhyClk[0 ]); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency); - result =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &result); smu10_data->gfx_min_freq_limit = result /10 *1000 ; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency); - result =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &result); smu10_data->gfx_max_freq_limit = result /10 *1000 ;return 0 ;
@@ -588,116 +591,148 @@ static int smu10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,case AMD_DPM_FORCED_LEVEL_PROFILE_PEAK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - data->gfx_max_freq_limit/100 ); + data->gfx_max_freq_limit/100 , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, -SMU10_UMD_PSTATE_PEAK_FCLK ); +SMU10_UMD_PSTATE_PEAK_FCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinSocclkByFreq, -SMU10_UMD_PSTATE_PEAK_SOCCLK ); +SMU10_UMD_PSTATE_PEAK_SOCCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinVcn, -SMU10_UMD_PSTATE_VCE ); +SMU10_UMD_PSTATE_VCE , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, - data->gfx_max_freq_limit/100 ); + data->gfx_max_freq_limit/100 , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_PEAK_FCLK ); +SMU10_UMD_PSTATE_PEAK_FCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxSocclkByFreq, -SMU10_UMD_PSTATE_PEAK_SOCCLK ); +SMU10_UMD_PSTATE_PEAK_SOCCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxVcn, -SMU10_UMD_PSTATE_VCE ); +SMU10_UMD_PSTATE_VCE , +NULL );break ;case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_SCLK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - min_sclk); + min_sclk, +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, - min_sclk); + min_sclk, +NULL );break ;case AMD_DPM_FORCED_LEVEL_PROFILE_MIN_MCLK :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, - min_mclk); + min_mclk, +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, - min_mclk); + min_mclk, +NULL );break ;case AMD_DPM_FORCED_LEVEL_PROFILE_STANDARD :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, -SMU10_UMD_PSTATE_GFXCLK ); +SMU10_UMD_PSTATE_GFXCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, -SMU10_UMD_PSTATE_FCLK ); +SMU10_UMD_PSTATE_FCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinSocclkByFreq, -SMU10_UMD_PSTATE_SOCCLK ); +SMU10_UMD_PSTATE_SOCCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinVcn, -SMU10_UMD_PSTATE_VCE ); +SMU10_UMD_PSTATE_VCE , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, -SMU10_UMD_PSTATE_GFXCLK ); +SMU10_UMD_PSTATE_GFXCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_FCLK ); +SMU10_UMD_PSTATE_FCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxSocclkByFreq, -SMU10_UMD_PSTATE_SOCCLK ); +SMU10_UMD_PSTATE_SOCCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxVcn, -SMU10_UMD_PSTATE_VCE ); +SMU10_UMD_PSTATE_VCE , +NULL );break ;case AMD_DPM_FORCED_LEVEL_AUTO :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - min_sclk); + min_sclk, +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, hwmgr->display_config->num_display >3 ?SMU10_UMD_PSTATE_PEAK_FCLK : - min_mclk); + min_mclk, +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinSocclkByFreq, -SMU10_UMD_PSTATE_MIN_SOCCLK ); +SMU10_UMD_PSTATE_MIN_SOCCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinVcn, -SMU10_UMD_PSTATE_MIN_VCE ); +SMU10_UMD_PSTATE_MIN_VCE , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, - data->gfx_max_freq_limit/100 ); + data->gfx_max_freq_limit/100 , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, -SMU10_UMD_PSTATE_PEAK_FCLK ); +SMU10_UMD_PSTATE_PEAK_FCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxSocclkByFreq, -SMU10_UMD_PSTATE_PEAK_SOCCLK ); +SMU10_UMD_PSTATE_PEAK_SOCCLK , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxVcn, -SMU10_UMD_PSTATE_VCE ); +SMU10_UMD_PSTATE_VCE , +NULL );break ;case AMD_DPM_FORCED_LEVEL_LOW :smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinGfxClk, - data->gfx_min_freq_limit/100 ); + data->gfx_min_freq_limit/100 , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, - data->gfx_min_freq_limit/100 ); + data->gfx_min_freq_limit/100 , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, - min_mclk); + min_mclk, +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, - min_mclk); + min_mclk, +NULL );break ;case AMD_DPM_FORCED_LEVEL_MANUAL :case AMD_DPM_FORCED_LEVEL_PROFILE_EXIT :
@@ -849,13 +884,15 @@ static int smu10_force_clock_level(struct pp_hwmgr *hwmgr, PPSMC_MSG_SetHardMinGfxClk, low ==2 ? data->gfx_max_freq_limit/100 : low ==1 ?SMU10_UMD_PSTATE_GFXCLK : - data->gfx_min_freq_limit/100); + data->gfx_min_freq_limit/100 , + NULL);smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxGfxClk, high ==0 ? data->gfx_min_freq_limit/100 : high ==1 ?SMU10_UMD_PSTATE_GFXCLK : - data->gfx_max_freq_limit/100 ); + data->gfx_max_freq_limit/100 , +NULL );break ;case PP_MCLK :
@@ -864,11 +901,13 @@ static int smu10_force_clock_level(struct pp_hwmgr *hwmgr,smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetHardMinFclkByFreq, - mclk_table->entries[low].clk/100 ); + mclk_table->entries[low].clk/100 , +NULL );smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetSoftMaxFclkByFreq, - mclk_table->entries[high].clk/100 ); + mclk_table->entries[high].clk/100 , +NULL );break ;case PP_PCIE :
@@ -888,8 +927,7 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr,switch (type) {case PP_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency); - now =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &now);/* driver only know min/max gfx_clk, Add level 1 for all other gfx clks */ if (now == data->gfx_max_freq_limit/100 )
@@ -910,8 +948,7 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr, i == 2 ? "*" : "");break ;case PP_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency); - now =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency, &now);for (i =0 ; i < mclk_table->count; i++) size += sprintf(buf + size, "%d: %uMhz %s\n",
@@ -1122,15 +1159,13 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency); - sclk =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &sclk);/* in units of 10KHZ */ *((uint32_t *)value) = sclk *100 ; *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency); - mclk =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency, &mclk);/* in units of 10KHZ */ *((uint32_t *)value) = mclk *100 ; *size =4 ;
@@ -1166,20 +1201,20 @@ static int smu10_set_watermarks_for_clocks_ranges(struct pp_hwmgr *hwmgr,static int smu10_smus_notify_pwe (struct pp_hwmgr *hwmgr) { -return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_SetRccPfcPmeRestoreRegister); +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_SetRccPfcPmeRestoreRegister,NULL ); }static int smu10_powergate_mmhub (struct pp_hwmgr *hwmgr) { -return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerGateMmHub); +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerGateMmHub,NULL ); }static int smu10_powergate_sdma (struct pp_hwmgr *hwmgr,bool gate) {if (gate) -return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerDownSdma); +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerDownSdma,NULL );else -return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerUpSdma); +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PowerUpSdma,NULL ); }static void smu10_powergate_vcn (struct pp_hwmgr *hwmgr,bool bgate)
@@ -1191,11 +1226,11 @@ static void smu10_powergate_vcn(struct pp_hwmgr *hwmgr, bool bgate)AMD_IP_BLOCK_TYPE_VCN , AMD_PG_STATE_GATE);smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_PowerDownVcn,0 ); + PPSMC_MSG_PowerDownVcn,0 ,NULL ); smu10_data->vcn_power_gated = true; }else {smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_PowerUpVcn,0 ); + PPSMC_MSG_PowerUpVcn,0 ,NULL );amdgpu_device_ip_set_powergating_state (hwmgr->adev,AMD_IP_BLOCK_TYPE_VCN ,AMD_PG_STATE_UNGATE );
@@ -1304,7 +1339,8 @@ static int smu10_set_power_profile_mode(struct pp_hwmgr *hwmgr, long *input, uin hwmgr->gfxoff_state_changed_by_workload = true; } result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ActiveProcessNotify, -1 << workload_type); +1 << workload_type, +NULL );if (!result) hwmgr->power_profile_mode = input[size];if (workload_type && hwmgr->gfxoff_state_changed_by_workload) {
@@ -1319,7 +1355,8 @@ static int smu10_asic_reset(struct pp_hwmgr *hwmgr, enum SMU_ASIC_RESET_MODE mod {return smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_DeviceDriverReset, - mode); + mode, +NULL ); }static const struct pp_hwmgr_func smu10_hwmgr_funcs = {
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_clockpowergating.c +34 -27
213 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +79 -56
424 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_powertune.c +28 -12
@@ -887,7 +887,10 @@ static int smu7_enable_didt(struct pp_hwmgr *hwmgr, const bool enable) didt_block |= block_en << TCP_Enable_SHIFT;if (enable) - result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_Didt_Block_Function, didt_block); + result =smum_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_Didt_Block_Function, + didt_block, +NULL );return result; }
@@ -1009,7 +1012,8 @@ int smu7_enable_didt_config(struct pp_hwmgr *hwmgr)if (hwmgr->chip_id ==CHIP_POLARIS11 ) { result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_EnableDpmDidt)); + (uint16_t )(PPSMC_MSG_EnableDpmDidt), +NULL );PP_ASSERT_WITH_CODE ((0 == result), "Failed to enable DPM DIDT.", goto error); }
@@ -1042,7 +1046,8 @@ int smu7_disable_didt_config(struct pp_hwmgr *hwmgr) goto error);if (hwmgr->chip_id ==CHIP_POLARIS11 ) { result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_DisableDpmDidt)); + (uint16_t )(PPSMC_MSG_DisableDpmDidt), +NULL );PP_ASSERT_WITH_CODE ((0 == result), "Failed to disable DPM DIDT.", goto error); }
@@ -1063,7 +1068,8 @@ int smu7_enable_smc_cac(struct pp_hwmgr *hwmgr)if (PP_CAP (PHM_PlatformCaps_CAC)) {int smc_result; smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_EnableCac)); + (uint16_t )(PPSMC_MSG_EnableCac), +NULL );PP_ASSERT_WITH_CODE ((0 == smc_result),"Failed to enable CAC in SMC." , result =-1 );
@@ -1079,7 +1085,8 @@ int smu7_disable_smc_cac(struct pp_hwmgr *hwmgr)if (PP_CAP (PHM_PlatformCaps_CAC) && data->cac_enabled) {int smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_DisableCac)); + (uint16_t )(PPSMC_MSG_DisableCac), +NULL );PP_ASSERT_WITH_CODE ((smc_result ==0 ),"Failed to disable CAC in SMC." , result =-1 );
@@ -1095,7 +1102,9 @@ int smu7_set_power_limit(struct pp_hwmgr *hwmgr, uint32_t n)if (data->power_containment_features & POWERCONTAINMENT_FEATURE_PkgPwrLimit)return smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_PkgPwrSetLimit, n<<8 ); + PPSMC_MSG_PkgPwrSetLimit, + n<<8 , +NULL );return 0 ; }
@@ -1103,7 +1112,9 @@ static int smu7_set_overdriver_target_tdp(struct pp_hwmgr *hwmgr, uint32_t target_tdp) {return smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_OverDriveSetTargetTdp, target_tdp); + PPSMC_MSG_OverDriveSetTargetTdp, + target_tdp, +NULL ); }int smu7_enable_power_containment (struct pp_hwmgr *hwmgr)
@@ -1124,7 +1135,8 @@ int smu7_enable_power_containment(struct pp_hwmgr *hwmgr)if (PP_CAP (PHM_PlatformCaps_PowerContainment)) {if (data->enable_tdc_limit_feature) { smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_TDCLimitEnable)); + (uint16_t )(PPSMC_MSG_TDCLimitEnable), +NULL );PP_ASSERT_WITH_CODE ((0 == smc_result), "Failed to enable TDCLimit in SMC.", result = -1;);if (0 == smc_result)
@@ -1134,7 +1146,8 @@ int smu7_enable_power_containment(struct pp_hwmgr *hwmgr)if (data->enable_pkg_pwr_tracking_feature) { smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_PkgPwrLimitEnable)); + (uint16_t )(PPSMC_MSG_PkgPwrLimitEnable), +NULL );PP_ASSERT_WITH_CODE ((0 == smc_result), "Failed to enable PkgPwrTracking in SMC.", result = -1;);if (0 == smc_result) {
@@ -1163,7 +1176,8 @@ int smu7_disable_power_containment(struct pp_hwmgr *hwmgr)if (data->power_containment_features & POWERCONTAINMENT_FEATURE_TDCLimit) { smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_TDCLimitDisable)); + (uint16_t )(PPSMC_MSG_TDCLimitDisable), +NULL );PP_ASSERT_WITH_CODE ((smc_result ==0 ),"Failed to disable TDCLimit in SMC." , result = smc_result);
@@ -1172,7 +1186,8 @@ int smu7_disable_power_containment(struct pp_hwmgr *hwmgr)if (data->power_containment_features &POWERCONTAINMENT_FEATURE_DTE ) { smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_DisableDTE)); + (uint16_t )(PPSMC_MSG_DisableDTE), +NULL );PP_ASSERT_WITH_CODE ((smc_result ==0 ),"Failed to disable DTE in SMC." , result = smc_result);
@@ -1181,7 +1196,8 @@ int smu7_disable_power_containment(struct pp_hwmgr *hwmgr)if (data->power_containment_features & POWERCONTAINMENT_FEATURE_PkgPwrLimit) { smc_result =smum_send_msg_to_smc (hwmgr, - (uint16_t )(PPSMC_MSG_PkgPwrLimitDisable)); + (uint16_t )(PPSMC_MSG_PkgPwrLimitDisable), +NULL );PP_ASSERT_WITH_CODE ((smc_result ==0 ),"Failed to disable PkgPwrTracking in SMC." , result = smc_result);
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c +7 -6
@@ -152,7 +152,7 @@ int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr)if (PP_CAP (PHM_PlatformCaps_ODFuzzyFanControlSupport)) { result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_StartFanControl, -FAN_CONTROL_FUZZY ); +FAN_CONTROL_FUZZY ,NULL );if (PP_CAP (PHM_PlatformCaps_FanSpeedInTableIsRPM)) hwmgr->hwmgr_func->set_max_fan_rpm_output(hwmgr,
@@ -165,7 +165,7 @@ int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr) } else { result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_StartFanControl, -FAN_CONTROL_TABLE ); +FAN_CONTROL_TABLE ,NULL ); } if (!result && hwmgr->thermal_controller.
@@ -173,7 +173,8 @@ int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr) result =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetFanTemperatureTarget, hwmgr->thermal_controller. - advanceFanControlParameters.ucTargetTemperature); + advanceFanControlParameters.ucTargetTemperature, +NULL ); hwmgr->fan_ctrl_enabled = true;return result;
@@ -183,7 +184,7 @@ int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr)int smu7_fan_ctrl_stop_smc_fan_control (struct pp_hwmgr *hwmgr) { hwmgr->fan_ctrl_enabled = false; -return smum_send_msg_to_smc (hwmgr, PPSMC_StopFanControl); +return smum_send_msg_to_smc (hwmgr, PPSMC_StopFanControl,NULL ); }/**
@@ -372,7 +373,7 @@ static void smu7_thermal_enable_alert(struct pp_hwmgr *hwmgr) CG_THERMAL_INT, THERM_INT_MASK, alert);/* send message to SMU to enable internal thermal interrupts */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_Thermal_Cntl_Enable); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_Thermal_Cntl_Enable,NULL ); }/**
@@ -390,7 +391,7 @@ int smu7_thermal_disable_alert(struct pp_hwmgr *hwmgr) CG_THERMAL_INT, THERM_INT_MASK, alert);/* send message to SMU to disable internal thermal interrupts */ -return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_Thermal_Cntl_Disable); +return smum_send_msg_to_smc (hwmgr, PPSMC_MSG_Thermal_Cntl_Disable,NULL ); }/**
drivers/gpu/drm/amd/powerplay/hwmgr/smu8_hwmgr.c +102 -55
419 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/smu_helper.c +3 -1
@@ -557,7 +557,9 @@ void phm_apply_dal_min_voltage_request(struct pp_hwmgr *hwmgr)if (req_vddc <= vddc_table->entries[i].vddc) { req_volt = (((uint32_t )vddc_table->entries[i].vddc) *VOLTAGE_SCALE );smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_VddC_Request, req_volt); + PPSMC_MSG_VddC_Request, + req_volt, +NULL );return ; } }
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_baco.c +1 -1
@@ -107,7 +107,7 @@ int vega10_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state)if (state ==BACO_STATE_IN ) {if (soc15_baco_program_registers (hwmgr, pre_baco_tbl,ARRAY_SIZE (pre_baco_tbl))) { -if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_EnterBaco)) +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_EnterBaco,NULL ))return -EINVAL ; if (soc15_baco_program_registers(hwmgr, enter_baco_tbl,
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +78 -63
369 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_powertune.c +6 -3
@@ -925,7 +925,8 @@ static void vega10_didt_set_mask(struct pp_hwmgr *hwmgr, const bool enable)/* For Vega10, SMC does not support any mask yet. */ if (enable) -smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ConfigureGfxDidt, didt_block_info); +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_ConfigureGfxDidt, didt_block_info, +NULL ); }
@@ -1327,7 +1328,8 @@ int vega10_set_power_limit(struct pp_hwmgr *hwmgr, uint32_t n)if (data->registry_data.enable_pkg_pwr_tracking_feature)smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_SetPptLimit, n); + PPSMC_MSG_SetPptLimit, n, +NULL );return 0 ; }
@@ -1393,7 +1395,8 @@ static void vega10_set_overdrive_target_percentage(struct pp_hwmgr *hwmgr, uint32_t adjust_percent) {smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_OverDriveSetPercentage, adjust_percent); + PPSMC_MSG_OverDriveSetPercentage, adjust_percent, +NULL ); }int vega10_power_control_set_level (struct pp_hwmgr *hwmgr)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +3 -3
@@ -31,8 +31,7 @@static int vega10_get_current_rpm (struct pp_hwmgr *hwmgr,uint32_t *current_rpm) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentRpm); - *current_rpm =smum_get_argument (hwmgr); +smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentRpm, current_rpm);return 0 ; }
@@ -520,7 +519,8 @@ int vega10_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetFanTemperatureTarget, - (uint32_t )table->FanTargetTemperature); + (uint32_t )table->FanTargetTemperature, +NULL ); table->FanPwmMin = hwmgr->thermal_controller. advanceFanControlParameters.usPWMMin *255 /100 ;
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_baco.c +1 -1
@@ -96,7 +96,7 @@ int vega12_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state)if (state ==BACO_STATE_IN ) {if (soc15_baco_program_registers (hwmgr, pre_baco_tbl,ARRAY_SIZE (pre_baco_tbl))) { -if (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnterBaco,0 )) +if (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnterBaco,0 ,NULL ))return -EINVAL ; if (soc15_baco_program_registers(hwmgr, enter_baco_tbl,
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_hwmgr.c +85 -64
427 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega12_thermal.c +4 -3
@@ -32,10 +32,10 @@static int vega12_get_current_rpm (struct pp_hwmgr *hwmgr,uint32_t *current_rpm) {PP_ASSERT_WITH_CODE (!smum_send_msg_to_smc (hwmgr, - PPSMC_MSG_GetCurrentRpm), + PPSMC_MSG_GetCurrentRpm, + current_rpm),"Attempt to get current RPM from SMC Failed!" , return -EINVAL ); - *current_rpm =smum_get_argument (hwmgr);return 0 ; }
@@ -259,7 +259,8 @@ int vega12_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) ret =smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_SetFanTemperatureTarget, - (uint32_t )table->FanTargetTemperature); + (uint32_t )table->FanTargetTemperature, +NULL );return ret; }
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c +5 -5
@@ -91,16 +91,16 @@ int vega20_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state)WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data);if (smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_EnterBaco,0 )) + PPSMC_MSG_EnterBaco,0 ,NULL ))return -EINVAL ; }else {if (smum_send_msg_to_smc_with_parameter (hwmgr, - PPSMC_MSG_EnterBaco,1 )) + PPSMC_MSG_EnterBaco,1 ,NULL ))return -EINVAL ; } }else if (state ==BACO_STATE_OUT ) { -if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ExitBaco)) +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ExitBaco,NULL ))return -EINVAL ;if (!soc15_baco_program_registers (hwmgr, clean_baco_tbl,ARRAY_SIZE (clean_baco_tbl)))
@@ -120,12 +120,12 @@ int vega20_baco_apply_vdci_flush_workaround(struct pp_hwmgr *hwmgr)if (ret)return ret; - ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_BacoWorkAroundFlushVDCI); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_BacoWorkAroundFlushVDCI,NULL );if (ret)return ret;if (ras && ras->supported) - ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PrepareMp1ForUnload); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_PrepareMp1ForUnload,NULL );return ret; }
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +104 -77
477 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_powertune.c +4 -2
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_thermal.c +4 -3
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/inc/smumgr.h +3 -4
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +8 -6
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +18 -12
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +18 -12
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/smu10_smumgr.c +15 -10
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +15 -7
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/smu8_smumgr.c +30 -17
47 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +30 -14
44 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/tonga_smumgr.c +8 -6
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/vega10_smumgr.c +25 -13
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/vega12_smumgr.c +24 -16
Lines of this file are not shown. View the raw message.
drivers/gpu/drm/amd/powerplay/smumgr/vega20_smumgr.c +38 -24
62 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/vegam_smumgr.c +11 -6
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Part of the diff is not shown here. View the raw message.
PATCH 9/9 drm/amd/powerplay: added mutex protection on msg issuing
In reply to Evan QuanThis could avoid the possible race condition.
--- drivers/gpu/drm/amd/powerplay/amd_powerplay.c | 3 +++ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 16 ++++++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amd_powerplay.c +3 -0
@@ -50,6 +50,7 @@ static int amd_powerplay_create(struct amdgpu_device *adev) hwmgr->not_vf = !amdgpu_sriov_vf (adev); hwmgr->device =amdgpu_cgs_create_device (adev);mutex_init (&hwmgr->smu_lock); +mutex_init (&hwmgr->msg_lock); hwmgr->chip_family = adev->family; hwmgr->chip_id = adev->asic_type; hwmgr->feature_mask = adev->pm.pp_feature;
@@ -64,6 +65,8 @@ static void amd_powerplay_destroy(struct amdgpu_device *adev) {struct pp_hwmgr *hwmgr = adev->powerplay.pp_handle; +mutex_destroy (&hwmgr->msg_lock); +kfree (hwmgr->hardcode_pp_table); hwmgr->hardcode_pp_table =NULL ;
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -0
@@ -744,6 +744,7 @@ struct pp_hwmgr {bool pm_en;bool pp_one_vf;struct mutex smu_lock; +struct mutex msg_lock;uint32_t pp_table_version;void *device;
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +14 -2
@@ -136,13 +136,19 @@ int smum_send_msg_to_smc(struct pp_hwmgr *hwmgr, uint16_t msg, uint32_t *resp) (resp && !hwmgr->smumgr_funcs->get_argument)) return -EINVAL; +mutex_lock (&hwmgr->msg_lock); + ret = hwmgr->smumgr_funcs->send_msg_to_smc (hwmgr, msg); -if (ret) +if (ret) { +mutex_unlock (&hwmgr->msg_lock);return ret; + }if (resp) *resp = hwmgr->smumgr_funcs->get_argument (hwmgr); +mutex_unlock (&hwmgr->msg_lock); +return ret; }
@@ -158,14 +164,20 @@ int smum_send_msg_to_smc_with_parameter(struct pp_hwmgr *hwmgr, (resp && !hwmgr->smumgr_funcs->get_argument)) return -EINVAL; +mutex_lock (&hwmgr->msg_lock); + ret = hwmgr->smumgr_funcs->send_msg_to_smc_with_parameter ( hwmgr, msg, parameter); -if (ret) +if (ret) { +mutex_unlock (&hwmgr->msg_lock);return ret; + }if (resp) *resp = hwmgr->smumgr_funcs->get_argument (hwmgr); +mutex_unlock (&hwmgr->msg_lock); +return ret; }
Signature · 6 lines
2.26.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
Series is Reviewed-by: Kenneth Feng <[email protected]>
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Evan Quan
Sent: Friday, March 27, 2020 11:42 AM
To: [email protected]
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 1/9] drm/amd/powerplay: avoid calling CI specific SMU message implemention
[CAUTION: External Email]
Prepare for coming lock protection for SMU message issuing.
--- drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/ci_smumgr.c +2 -2
@@ -2881,7 +2881,7 @@ static int ci_update_uvd_smc_table(struct pp_hwmgr *hwmgr)if (hwmgr->dpm_level & profile_mode_mask || !PP_CAP (PHM_PlatformCaps_UVDDPM))break ; } -ci_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_UVDDPM_SetEnabledMask, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_UVDDPM_SetEnabledMask, data->dpm_level_enable_mask.uvd_dpm_enable_mask);return 0 ;
@@ -2912,7 +2912,7 @@ static int ci_update_vce_smc_table(struct pp_hwmgr *hwmgr)if (hwmgr->dpm_level & profile_mode_mask || !PP_CAP (PHM_PlatformCaps_VCEDPM))break ; } -ci_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_VCEDPM_SetEnabledMask, +smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_VCEDPM_SetEnabledMask, data->dpm_level_enable_mask.vce_dpm_enable_mask);return 0 ;
--
2.26.0
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7CKenneth.Feng%40amd.com%7Cd0c794f6d62847584bd808d7d200d19b%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637208773277606490&sdata=j%2FOi%2Fb7OjR4csoQAhlmTIbwz6mgrp%2FS9XExNWgFSRmc%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx