drm/amd/powerplay: fix avfs state update error on polaris.
Subsystems (2)
PATCH 1/4 drm/amd/powerplay: fix avfs state update error on polaris.
always lead to print avfs broken in dmesg.
--- drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +3 -2
@@ -200,15 +200,16 @@ static int polaris10_setup_graphics_level_structure(struct pp_smumgr *smumgr)PP_ASSERT_WITH_CODE (0 ==polaris10_perform_btc (smumgr),"[AVFS][Polaris10_AVFSEventMgr] Failure at SmuPolaris10_PerformBTC. AVFS Disabled" , return -1 ); - + smu_data->avfs.avfs_btc_status =AVFS_BTC_ENABLEAVFS ;break ;case AVFS_BTC_DISABLED : +case AVFS_BTC_ENABLEAVFS :case AVFS_BTC_NOTSUPPORTED :break ;default : -pr_info ("[AVFS] Something is broken. See log!" ); +pr_err ("AVFS failed status is %x!\n" , smu_data->avfs.avfs_btc_status);break ; }
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): 1499076813-9833-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/4 drm/amd/powerplay: refine avfs enable code on fiji.
1. simplify avfs state switch.
2. delete save/restore VFT table functions as not support by fiji.
3. implement thermal_avfs_enable funciton.
--- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 19 ++++ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 115 ++------------------- 3 files changed, 28 insertions(+), 107 deletions(-)
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +19 -0
@@ -2129,6 +2129,25 @@ int fiji_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)return 0 ; } + +int fiji_thermal_avfs_enable (struct pp_hwmgr *hwmgr) +{ +int ret; +struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr->smumgr); +struct fiji_smumgr *smu_data = (struct fiji_smumgr *)(smumgr->backend); + +if (smu_data->avfs.AvfsBtcStatus !=AVFS_BTC_ENABLEAVFS ) +return 0 ; + + ret =smum_send_msg_to_smc (smumgr, PPSMC_MSG_EnableAvfs); + +if (!ret) +/* If this param is not changed, this function could fire unnecessarily */ + smu_data->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_PREVIOUSLY ; + +return ret; +} +static int fiji_program_mem_timing_parameters (struct pp_hwmgr *hwmgr) {struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h +1 -0
@@ -48,5 +48,6 @@ struct fiji_pt_defaults {bool fiji_is_dpm_running (struct pp_hwmgr *hwmgr);int fiji_populate_requested_graphic_levels (struct pp_hwmgr *hwmgr,struct amd_pp_profile *request); +int fiji_thermal_avfs_enable (struct pp_hwmgr *hwmgr);#endif
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +8 -107
163 lines not on this page · raw message
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): 1499076813-9833-2-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Acked-by Alex DeucherRE: [PATCH 2/4] drm/amd/powerplay: refine avfs enable code on fiji.
Quoted 8 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Monday, July 03, 2017 6:14 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 2/4] drm/amd/powerplay: refine avfs enable code on fiji.
Quoted 7 lines
1. simplify avfs state switch.
2. delete save/restore VFT table functions as not support by fiji.
3. implementthermal_avfs_enablefunciton.Change-Id I5e28672591d77b1ec9e3406d0fc7d42566831a08Signed-off-by Rex Zhu <[email protected]>
Quoted 270 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 19 ++++ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h | 1 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 115 ++------------ ------- 3 files changed, 28 insertions(+), 107 deletions(-)drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +11
-0@@ -2129,6 +2129,25 @@ int fiji_thermal_setup_fan_table(struct pp_hwmgr *hwmgr)return 0 ; } + +int fiji_thermal_avfs_enable (struct pp_hwmgr *hwmgr) +{ +int ret; +struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr- >smumgr); +struct fiji_smumgr *smu_data = (struct fiji_smumgr *)(smumgr- >backend); + +if (smu_data->avfs.AvfsBtcStatus !=AVFS_BTC_ENABLEAVFS ) +return 0 ; + + ret = smum_send_msg_to_smc(smumgr,
PPSMC_MSG_EnableAvfs);drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +3
-0+ +if (!ret) +/* If this param is not changed, this function could fire unnecessarily */
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +1
-0+ smu_data->avfs.AvfsBtcStatus =
AVFS_BTC_COMPLETED_PREVIOUSLY;drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +4
-0+ +return ret; +} +static int fiji_program_mem_timing_parameters (struct pp_hwmgr *hwmgr) { struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr-Quoted 1 line
backend);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.h +1
-0@@ -48,5 +48,6 @@ struct fiji_pt_defaults {bool fiji_is_dpm_running (struct pp_hwmgr *hwmgr);int fiji_populate_requested_graphic_levels (struct pp_hwmgr *hwmgr,struct amd_pp_profile *request); +int fiji_thermal_avfs_enable (struct pp_hwmgr *hwmgr);#endif drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-8@@ -194,22 +194,10 @@ static int fiji_start_avfs_btc(struct pp_smumgr *smumgr)int result =0 ;struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend); - priv->avfs.AvfsBtcStatus =AVFS_BTC_STARTED ;if (priv->avfs.AvfsBtcParam) {if (!smum_send_msg_to_smc_with_parameter (smumgr, PPSMC_MSG_PerformBtc, priv- >avfs.AvfsBtcParam)) { -if (!smum_send_msg_to_smc (smumgr, PPSMC_MSG_EnableAvfs)) { - priv->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_UNSAVED ; - result =0 ; - }else { -pr_err ("[AVFS][fiji_start_avfs_btc] Attempt" -" to Enable AVFS Failed!" ); - smum_send_msg_to_smc(smumgr,
PPSMC_MSG_DisableAvfs);drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1
-17- result =-1 ; - } - }else { -pr_err ("[AVFS][fiji_start_avfs_btc] " -"PerformBTC SMU msg failed" ); +pr_err ("PerformBTC SMU msg failed \n" ); result =-1 ; } }@@ -224,42 +212,6 @@ static int fiji_start_avfs_btc(struct pp_smumgr*smumgr) return result; } -static int fiji_setup_pm_fuse_for_avfs(struct pp_smumgr *smumgr) -{ - int result = 0; - uint32_t table_start; - uint32_t charz_freq_addr, inversion_voltage_addr, charz_freq; - uint16_t inversion_voltage; - - charz_freq = 0x30750000; /* In 10KHz units 0x00007530 Actual value*/ - inversion_voltage = 0x1A04; /* mV Q14.2 0x41A Actual value */ - - PP_ASSERT_WITH_CODE(0 == smu7_read_smc_sram_dword(smumgr, - SMU7_FIRMWARE_HEADER_LOCATION +offsetof(SMU73_Firmware_Header,
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-1- PmFuseTable), &table_start,
0x40000),drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-1- "[AVFS][Fiji_SetupGfxLvlStruct] SMU could notcommunicate "
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-5-"starting address of PmFuse structure" , - return -1;); - - charz_freq_addr = table_start + - offsetof(struct SMU73_Discrete_PmFuses,PsmCharzFreq);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-2- inversion_voltage_addr = table_start + - offsetof(struct SMU73_Discrete_PmFuses,InversionVoltage);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-3- - result = smu7_copy_bytes_to_smc(smumgr, charz_freq_addr, - (uint8_t *)(&charz_freq), sizeof(charz_freq),
0x40000);drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-2- PP_ASSERT_WITH_CODE(0 == result, - "[AVFS][fiji_setup_pm_fuse_for_avfs] charz_freqcould not "
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-3- "be populated.", return -1;); - - result = smu7_copy_bytes_to_smc(smumgr,
inversion_voltage_addr,drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-1- (uint8_t *)(&inversion_voltage),
sizeof(inversion_voltage),0x40000);drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-1- PP_ASSERT_WITH_CODE(0 == result,"[AVFS][fiji_setup_pm_fuse_for_avfs] "
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-33- "charz_freq could not be populated.", return -1;); - -return result; -} -static int fiji_setup_graphics_level_structure (struct pp_smumgr *smumgr) {int32_t vr_config;@@ -298,67 +250,18 @@ static int fiji_setup_graphics_level_structure(struct pp_smumgr *smumgr)return 0 ; } -/* Work in Progress */ -static int fiji_restore_vft_table (struct pp_smumgr *smumgr) -{ -struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend); - -if (AVFS_BTC_COMPLETED_SAVED == priv->avfs.AvfsBtcStatus) { - priv->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_RESTORED ; -return 0 ; - }else -return -EINVAL ; -} - -/* Work in Progress */ -static int fiji_save_vft_table (struct pp_smumgr *smumgr) -{ -struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend); - -if (AVFS_BTC_COMPLETED_SAVED == priv->avfs.AvfsBtcStatus) { - priv->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_RESTORED ; -return 0 ; - }else -return -EINVAL ; -} -static int fiji_avfs_event_mgr (struct pp_smumgr *smumgr,bool smu_started) {struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend);switch (priv->avfs.AvfsBtcStatus) { -case AVFS_BTC_COMPLETED_SAVED :/*S3 State - Pre SMU Start */ - priv->avfs.AvfsBtcStatus =AVFS_BTC_RESTOREVFT_FAILED ; - PP_ASSERT_WITH_CODE(0 == fiji_restore_vft_table(smumgr), - "[AVFS][fiji_avfs_event_mgr] Could not CopyGraphics "
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-3-"Level table over to SMU" , - return -1;); - priv->avfs.AvfsBtcStatus =
AVFS_BTC_COMPLETED_RESTORED;drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-2-break ; -case AVFS_BTC_COMPLETED_RESTORED :/*S3 State - Post SMU Start*/
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-2- priv->avfs.AvfsBtcStatus =AVFS_BTC_SMUMSG_ERROR ; - PP_ASSERT_WITH_CODE(0 ==smum_send_msg_to_smc(smumgr,
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-2- 0x666), - "[AVFS][fiji_avfs_event_mgr] SMU did notrespond "
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-4-"correctly to VftTableIsValid Msg" , - return -1;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_SMUMSG_ERROR ; - PP_ASSERT_WITH_CODE(0 ==smum_send_msg_to_smc(smumgr,
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-2- PPSMC_MSG_EnableAvfs), - "[AVFS][fiji_avfs_event_mgr] SMU did notrespond "
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2
-4-"correctly to EnableAvfs Message Msg" , - return -1;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_SAVED ; +case AVFS_BTC_COMPLETED_PREVIOUSLY :break ; +case AVFS_BTC_BOOT :/*Cold Boot State - Post SMU Start*/ if (!smu_started)break ; priv->avfs.AvfsBtcStatus =AVFS_BTC_FAILED ; - PP_ASSERT_WITH_CODE(0 ==
fiji_setup_pm_fuse_for_avfs(smumgr),drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +0
-4-"[AVFS][fiji_avfs_event_mgr] Failure at " -"fiji_setup_pm_fuse_for_avfs" , - return -1;); - priv->avfs.AvfsBtcStatus =
AVFS_BTC_DPMTABLESETUP_FAILED;
PP_ASSERT_WITH_CODE(0 ==fiji_setup_graphics_level_structure(smumgr),
"[AVFS][fiji_avfs_event_mgr] Could not Copy
Graphics Level"drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +4
-7" table over to SMU",@@ -373,18 +276,15 @@ static int fiji_avfs_event_mgr(struct pp_smumgr *smumgr, bool smu_started)"[AVFS][fiji_avfs_event_mgr] Failure at " "fiji_start_avfs_btc. AVFS Disabled" , return -1;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_SAVEVFT_FAILED ; -PP_ASSERT_WITH_CODE (0 ==fiji_save_vft_table (smumgr), - "[AVFS][fiji_avfs_event_mgr] Could not save VFT Table", - return -1;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_SAVED ; + + priv->avfs.AvfsBtcStatus = AVFS_BTC_ENABLEAVFS;break ;case AVFS_BTC_DISABLED :/* Do nothing */ -break ;case AVFS_BTC_NOTSUPPORTED :/* Do nothing */ +case AVFS_BTC_ENABLEAVFS :break ;default : -pr_err ("[AVFS] Something is broken. See log!" ); +pr_err ("AVFS failed status is %x !\n" , priv- >avfs.AvfsBtcStatus);drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1
-1break ; }return 0 ;@@ -514,6 +414,7 @@ static int fiji_smu_init(struct pp_smumgr *smumgr) .init_smc_table = fiji_init_smc_table, .update_sclk_threshold = fiji_update_sclk_threshold, .thermal_setup_fan_table = fiji_thermal_setup_fan_table, + .thermal_avfs_enable = fiji_thermal_avfs_enable, .populate_all_graphic_levels = fiji_populate_all_graphic_levels, .populate_all_memory_levels = fiji_populate_all_memory_levels, .get_mac_definition = fiji_get_mac_definition, --1.9.1
Quoted 4 lines
_______________________________________________
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
PATCH 3/4 drm/amd/powerplay: move VI common AVFS code to smu7_smumgr.c
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 3 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 73 ++++++++++------------ drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 11 ---- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 29 ++++----- .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 12 +--- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 8 ++- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 8 +++ 10 files changed, 74 insertions(+), 86 deletions(-)
drivers/gpu/drm/amd/powerplay/inc/smumgr.h +3 -0
@@ -131,6 +131,7 @@ struct pp_smumgr_func {bool (*is_dpm_running)(struct pp_hwmgr *hwmgr);int (*populate_requested_graphic_levels)(struct pp_hwmgr *hwmgr,struct amd_pp_profile *request); +bool (*is_hw_avfs_present)(struct pp_smumgr *smumgr); };struct pp_smumgr {
@@ -202,6 +203,8 @@ extern uint32_t smum_get_offsetof(struct pp_smumgr *smumgr,extern int smum_populate_requested_graphic_levels (struct pp_hwmgr *hwmgr,struct amd_pp_profile *request); +extern bool smum_is_hw_avfs_present (struct pp_smumgr *smumgr); +#define SMUM_FIELD_SHIFT (reg, field) reg##__##field##__SHIFT#define SMUM_FIELD_MASK (reg, field) reg##__##field##_MASK
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +3 -3
@@ -2134,16 +2134,16 @@ int fiji_thermal_avfs_enable(struct pp_hwmgr *hwmgr) {int ret;struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr->smumgr); -struct fiji_smumgr *smu_data = (struct fiji_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); -if (smu_data->avfs.AvfsBtcStatus !=AVFS_BTC_ENABLEAVFS ) +if (smu_data->avfs.avfs_btc_param !=AVFS_BTC_ENABLEAVFS )return 0 ; ret =smum_send_msg_to_smc (smumgr, PPSMC_MSG_EnableAvfs);if (!ret)/* If this param is not changed, this function could fire unnecessarily */ - smu_data->avfs.AvfsBtcStatus =AVFS_BTC_COMPLETED_PREVIOUSLY ; + smu_data->avfs.avfs_btc_param =AVFS_BTC_COMPLETED_PREVIOUSLY ;return ret; }
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +32 -41
137 lines not on this page · raw message
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h +0 -11
@@ -28,17 +28,8 @@#include "smu7_smumgr.h" - -struct fiji_smu_avfs { -enum AVFS_BTC_STATUS AvfsBtcStatus; -uint32_t AvfsBtcParam; -}; - -struct fiji_smumgr {struct smu7_smumgr smu7_data; - -struct fiji_smu_avfs avfs;struct SMU73_Discrete_DpmTable smc_state_table;struct SMU73_Discrete_Ulv ulv_setting;struct SMU73_Discrete_PmFuses power_tune_table;
@@ -47,7 +38,5 @@ struct fiji_smumgr { }; - -#endif
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +2 -2
@@ -1498,7 +1498,7 @@ static int polaris10_populate_avfs_parameters(struct pp_hwmgr *hwmgr) table_info->vdd_dep_on_sclk; -if (smu_data->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED ) +if (((struct smu7_smumgr *)smu_data)->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED )return result; result =atomctrl_get_avfs_information (hwmgr, &avfs_params);
@@ -1889,7 +1889,7 @@ int polaris10_thermal_avfs_enable(struct pp_hwmgr *hwmgr) {int ret;struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr->smumgr); -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend);struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);if (smu_data->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED )
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +12 -17
@@ -60,16 +60,14 @@static const SMU74_Discrete_MemoryLevel avfs_memory_level_polaris10 = {0x100ea446 ,0 ,0x30750000 ,0x01 ,0x01 ,0x01 ,0x00 ,0x00 ,0x64 ,0x00 ,0x00 ,0x1f00 ,0x00 ,0x00 }; -static int polaris10_setup_pwr_virus (struct pp_smumgr *smumgr) {int i; -int result =-1 ; +int result = -EINVAL ;uint32_t reg, data;const PWR_Command_Table *pvirus = pwr_virus_table; -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); - +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend);for (i =0 ; i <PWR_VIRUS_TABLE_SIZE ; i++) {switch (pvirus->command) {
@@ -86,7 +84,7 @@ static int polaris10_setup_pwr_virus(struct pp_smumgr *smumgr)default :pr_info ("Table Exit with Invalid Command!" ); smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; - result =-1 ; + result = -EINVAL ;break ; } pvirus++;
@@ -98,7 +96,7 @@ static int polaris10_setup_pwr_virus(struct pp_smumgr *smumgr)static int polaris10_perform_btc (struct pp_smumgr *smumgr) {int result =0 ; -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend);if (0 != smu_data->avfs.avfs_btc_param) {if (0 !=smu7_send_msg_to_smc_with_parameter (smumgr, PPSMC_MSG_PerformBtc, smu_data->avfs.avfs_btc_param)) {
@@ -172,10 +170,11 @@ static int polaris10_setup_graphics_level_structure(struct pp_smumgr *smumgr)return 0 ; } +static int polaris10_avfs_event_mgr (struct pp_smumgr *smumgr,bool SMU_VFT_INTACT ) { -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend);switch (smu_data->avfs.avfs_btc_status) {case AVFS_BTC_COMPLETED_PREVIOUSLY :
@@ -185,21 +184,21 @@ static int polaris10_setup_graphics_level_structure(struct pp_smumgr *smumgr) smu_data->avfs.avfs_btc_status =AVFS_BTC_DPMTABLESETUP_FAILED ;PP_ASSERT_WITH_CODE (0 ==polaris10_setup_graphics_level_structure (smumgr), -"[AVFS][Polaris10_AVFSEventMgr] Could not Copy Graphics Level table over to SMU" , - return -1 ); +"[AVFS][Polaris10_AVFSEventMgr] Could not Copy Graphics Level table over to SMU" , + return -EINVAL );if (smu_data->avfs.avfs_btc_param >1 ) {pr_info ("[AVFS][Polaris10_AVFSEventMgr] AC BTC has not been successfully verified on Fiji. There may be in this setting." ); smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; -PP_ASSERT_WITH_CODE (-1 ==polaris10_setup_pwr_virus (smumgr), +PP_ASSERT_WITH_CODE (0 ==polaris10_setup_pwr_virus (smumgr),"[AVFS][Polaris10_AVFSEventMgr] Could not setup Pwr Virus for AVFS " , - return -1 ); + return -EINVAL ); } smu_data->avfs.avfs_btc_status =AVFS_BTC_FAILED ;PP_ASSERT_WITH_CODE (0 ==polaris10_perform_btc (smumgr),"[AVFS][Polaris10_AVFSEventMgr] Failure at SmuPolaris10_PerformBTC. AVFS Disabled" , - return -1 ); + return -EINVAL ); smu_data->avfs.avfs_btc_status =AVFS_BTC_ENABLEAVFS ;break ;
@@ -377,11 +376,6 @@ static int polaris10_smu_init(struct pp_smumgr *smumgr)if (smu7_init (smumgr))return -EINVAL ; -if (polaris10_is_hw_avfs_present (smumgr)) - smu_data->avfs.avfs_btc_status =AVFS_BTC_BOOT ; -else - smu_data->avfs.avfs_btc_status =AVFS_BTC_NOTSUPPORTED ; -for (i =0 ; i <SMU74_MAX_LEVELS_GRAPHICS ; i++) smu_data->activity_target[i] =PPPOLARIS10_TARGETACTIVITY_DFLT ;
@@ -411,4 +405,5 @@ static int polaris10_smu_init(struct pp_smumgr *smumgr) .get_mac_definition = polaris10_get_mac_definition, .is_dpm_running = polaris10_is_dpm_running, .populate_requested_graphic_levels = polaris10_populate_requested_graphic_levels, + .is_hw_avfs_present = polaris10_is_hw_avfs_present, };
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.h +2 -10
@@ -32,11 +32,6 @@#define SMC_RAM_END 0x40000 -struct polaris10_avfs { -enum AVFS_BTC_STATUS avfs_btc_status; -uint32_t avfs_btc_param; -}; -struct polaris10_pt_defaults {uint8_t SviLoadLineEn;uint8_t SviLoadLineVddC;
@@ -51,8 +46,6 @@ struct polaris10_pt_defaults {uint16_t BAPMTI_RC [SMU74_DTE_ITERATIONS *SMU74_DTE_SOURCES *SMU74_DTE_SINKS ]; }; - -struct polaris10_range_table {uint32_t trans_lower_frequency;/* in 10khz */ uint32_t trans_upper_frequency;
@@ -61,14 +54,13 @@ struct polaris10_range_table {struct polaris10_smumgr {struct smu7_smumgr smu7_data;uint8_t protected_mode; -struct polaris10_avfs avfs;SMU74_Discrete_DpmTable smc_state_table;struct SMU74_Discrete_Ulv ulv_setting;struct SMU74_Discrete_PmFuses power_tune_table;struct polaris10_range_table range_table[NUM_SCLK_RANGE ];const struct polaris10_pt_defaults *power_tune_defaults; -uint32_t activity_target[SMU74_MAX_LEVELS_GRAPHICS ]; -uint32_t bif_sclk_table[SMU74_MAX_LEVELS_LINK ]; +uint32_t activity_target[SMU74_MAX_LEVELS_GRAPHICS ]; +uint32_t bif_sclk_table[SMU74_MAX_LEVELS_LINK ]; };
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +5 -1
@@ -540,7 +540,6 @@ int smu7_upload_smu_firmware_image(struct pp_smumgr *smumgr)return result; } -int smu7_init (struct pp_smumgr *smumgr) {struct smu7_smumgr *smu_data;
@@ -596,6 +595,11 @@ int smu7_init(struct pp_smumgr *smumgr) (cgs_handle_t)smu_data->smu_buffer.handle); return -EINVAL); +if (smum_is_hw_avfs_present (smumgr)) + smu_data->avfs.avfs_btc_status =AVFS_BTC_BOOT ; +else + smu_data->avfs.avfs_btc_status =AVFS_BTC_NOTSUPPORTED ; +return 0 ; }
drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h +7 -1
@@ -37,6 +37,11 @@ struct smu7_buffer_entry {unsigned long handle; }; +struct smu7_avfs { +enum AVFS_BTC_STATUS avfs_btc_status; +uint32_t avfs_btc_param; +}; +struct smu7_smumgr {uint8_t *header;uint8_t *mec_image;
@@ -50,7 +55,8 @@ struct smu7_smumgr {uint32_t arb_table_start;uint32_t ulv_setting_starts;uint8_t security_hard_key; -uint32_t acpi_optimization; +uint32_t acpi_optimization; +struct smu7_avfs avfs; };
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +8 -0
@@ -402,3 +402,11 @@ int smum_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr,return 0 ; } + +bool smum_is_hw_avfs_present (struct pp_smumgr *smumgr) +{ +if (smumgr->smumgr_funcs->is_hw_avfs_present) +return smumgr->smumgr_funcs->is_hw_avfs_present (smumgr); + +return false; +}
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): 1499076813-9833-3-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 3/4] drm/amd/powerplay: move VI common AVFS code to smu7_smumgr.c
Quoted 554 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Monday, July 03, 2017 6:14 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 3/4] drm/amd/powerplay: move VI common AVFS code tosmu7_smumgr.cChange-Id I2bee3e700281a57ad77132794187ef45d2d79dcdSigned-off-by Rex Zhu <[email protected]>--- drivers/gpu/drm/amd/powerplay/inc/smumgr.h | 3 + drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c | 73 ++++++++++- ----------- drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h | 11 ---- .../gpu/drm/amd/powerplay/smumgr/polaris10_smc.c | 4 +- .../drm/amd/powerplay/smumgr/polaris10_smumgr.c | 29 ++++----- .../drm/amd/powerplay/smumgr/polaris10_smumgr.h | 12 +--- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c | 6 +- drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h | 8 ++- drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c | 8 +++ 10 files changed, 74 insertions(+), 86 deletions(-)drivers/gpu/drm/amd/powerplay/inc/smumgr.h +1
-0@@ -131,6 +131,7 @@ struct pp_smumgr_func {bool (*is_dpm_running)(struct pp_hwmgr *hwmgr);int (*populate_requested_graphic_levels)(struct pp_hwmgr *hwmgr,struct amd_pp_profile *request); +bool (*is_hw_avfs_present)(struct pp_smumgr *smumgr); };struct
pp_smumgr{drivers/gpu/drm/amd/powerplay/inc/smumgr.h +2
-0@@ -202,6 +203,8 @@ extern uint32_t smum_get_offsetof(structpp_smumgr *smumgr, extern int smum_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr,struct amd_pp_profile *request); +extern bool smum_is_hw_avfs_present (struct pp_smumgr *smumgr); +#define SMUM_FIELD_SHIFT (reg, field) reg##__##field##__SHIFT#define
SMUM_FIELD_MASK(reg, field)reg##__##field##_MASKdrivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +2
-2@@ -2134,16 +2134,16 @@ int fiji_thermal_avfs_enable(struct pp_hwmgr *hwmgr) {int ret;struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr- >smumgr); -struct fiji_smumgr *smu_data = (struct fiji_smumgr *)(smumgr- >backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); -if (smu_data->avfs.AvfsBtcStatus !=AVFS_BTC_ENABLEAVFS ) +if (smu_data->avfs.avfs_btc_param !=AVFS_BTC_ENABLEAVFS )return 0 ; ret =smum_send_msg_to_smc (smumgr, PPSMC_MSG_EnableAvfs);if (!ret)/* If this param is not changed, this function could fire
unnecessarily */drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +0
-1- smu_data->avfs.AvfsBtcStatus =
AVFS_BTC_COMPLETED_PREVIOUSLY;drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +1
-0+ smu_data->avfs.avfs_btc_param =
AVFS_BTC_COMPLETED_PREVIOUSLY;drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c +0
-0return ret; }drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +17
-17@@ -161,43 +161,46 @@ static int fiji_start_smu_in_non_protection_mode(struct pp_smumgr *smumgr) static int fiji_setup_pwr_virus(struct pp_smumgr *smumgr) { - int i, result = -1; +int i; +int result = -EINVAL ;uint32_t reg, data; - const PWR_Command_Table *virus = PwrVirusTable; - struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend); - priv->avfs.AvfsBtcStatus = AVFS_LOAD_VIRUS; - for (i = 0; (i < PWR_VIRUS_TABLE_SIZE); i++) { - switch (virus->command) { +const PWR_Command_Table *pvirus = PwrVirusTable; +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); + +for (i =0 ; i <PWR_VIRUS_TABLE_SIZE ; i++) { +switch (pvirus->command) {case PwrCmdWrite: - reg = virus->reg; - data = virus->data; + reg = pvirus->reg; + data = pvirus->data;cgs_write_register (smumgr->device, reg, data);break ; +case PwrCmdEnd: - priv->avfs.AvfsBtcStatus =AVFS_BTC_VIRUS_LOADED ; result =0 ;break ; +default : - pr_err("Table Exit with Invalid Command!"); - priv->avfs.AvfsBtcStatus = AVFS_BTC_VIRUS_FAIL; - result = -1; +pr_info ("Table Exit with Invalid Command!" ); + smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; + result = -EINVAL ;break ; } - virus++; + pvirus++; } +return result; }static int fiji_start_avfs_btc (struct pp_smumgr *smumgr) {int result =0 ; - struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); - if (priv->avfs.AvfsBtcParam) { - if (!smum_send_msg_to_smc_with_parameter(smumgr, - PPSMC_MSG_PerformBtc, priv-Quoted 1 line
avfs.AvfsBtcParam)) {
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +3
-1-pr_err ("PerformBTC SMU msg failed \n" ); + if (0 != smu_data->avfs.avfs_btc_param) { + if (0 != smu7_send_msg_to_smc_with_parameter(smumgr, + PPSMC_MSG_PerformBtc, smu_data-Quoted 1 line
avfs.avfs_btc_param)) {
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1
-0+ pr_info("[AVFS][SmuPolaris10_PerformBtc]PerformBTC SMU msg failed");
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +3
-3result =-1 ; } }@@ -252,39 +255,39 @@ static int fiji_setup_graphics_level_structure(struct pp_smumgr *smumgr)static int fiji_avfs_event_mgr (struct pp_smumgr *smumgr,bool smu_started) { -struct fiji_smumgr *priv = (struct fiji_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); -switch (priv->avfs.AvfsBtcStatus) { +switch (smu_data->avfs.avfs_btc_param) {case AVFS_BTC_COMPLETED_PREVIOUSLY :break ;case AVFS_BTC_BOOT :/*Cold Boot State - Post SMU Start*/ if (!smu_started)break ; - priv->avfs.AvfsBtcStatus =AVFS_BTC_FAILED ; + smu_data->avfs.avfs_btc_param =AVFS_BTC_FAILED ; PP_ASSERT_WITH_CODE(0 == fiji_setup_graphics_level_structure(smumgr), "[AVFS][fiji_avfs_event_mgr] Could not CopyGraphics Level"
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +2
-2" table over to SMU" , - return -1;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_VIRUS_FAIL ; + return -EINVAL;); + smu_data->avfs.avfs_btc_param =AVFS_BTC_VIRUS_FAIL ; PP_ASSERT_WITH_CODE(0 ==
fiji_setup_pwr_virus(smumgr),
"[AVFS][fiji_avfs_event_mgr] Could not
setup "drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +4
-5"Pwr Virus for AVFS " , - return -1;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_FAILED ; + return -EINVAL;); + smu_data->avfs.avfs_btc_param =AVFS_BTC_FAILED ;PP_ASSERT_WITH_CODE (0 ==fiji_start_avfs_btc (smumgr),"[AVFS][fiji_avfs_event_mgr] Failure at " "fiji_start_avfs_btc. AVFS Disabled" , - return -1;); + return -EINVAL;); - priv->avfs.AvfsBtcStatus =AVFS_BTC_ENABLEAVFS ; + smu_data->avfs.avfs_btc_param =AVFS_BTC_ENABLEAVFS ;break ;case AVFS_BTC_DISABLED :/* Do nothing */ case AVFS_BTC_NOTSUPPORTED :/* Do nothing */ case AVFS_BTC_ENABLEAVFS :break ;default : - pr_err("AVFS failed status is %x !\n", priv-Quoted 1 line
avfs.AvfsBtcStatus);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1
-0+ pr_err("AVFS failed status is %x !\n", smu_data-Quoted 1 line
avfs.avfs_btc_param);
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.c +1
-13break ; }return 0 ;@@ -377,19 +380,6 @@ static int fiji_smu_init(struct pp_smumgr *smumgr)if (smu7_init (smumgr))return -EINVAL ; - fiji_priv->avfs.AvfsBtcStatus =AVFS_BTC_BOOT ; -if (fiji_is_hw_avfs_present (smumgr)) -/* AVFS Parameter -* 0 - BTC DC disabled, BTC AC disabled -* 1 - BTC DC enabled, BTC AC disabled -* 2 - BTC DC disabled, BTC AC enabled -* 3 - BTC DC enabled, BTC AC enabled -* Default is 0 - BTC DC disabled, BTC AC disabled -*/ - fiji_priv->avfs.AvfsBtcParam =0 ; -else - fiji_priv->avfs.AvfsBtcStatus =AVFS_BTC_NOTSUPPORTED ; -for (i =0 ; i <SMU73_MAX_LEVELS_GRAPHICS ; i++) fiji_priv->activity_target[i] =30 ;@@ -421,4 +411,5 @@ static int fiji_smu_init(struct pp_smumgr *smumgr) .initialize_mc_reg_table = fiji_initialize_mc_reg_table, .is_dpm_running = fiji_is_dpm_running, .populate_requested_graphic_levels = fiji_populate_requested_graphic_levels, + .is_hw_avfs_present = fiji_is_hw_avfs_present,};
drivers/gpu/drm/amd/powerplay/smumgr/fiji_smumgr.h +0
-11@@ -28,17 +28,8 @@#include "smu7_smumgr.h" - -struct fiji_smu_avfs { -enum AVFS_BTC_STATUS AvfsBtcStatus; -uint32_t AvfsBtcParam; -}; - -struct fiji_smumgr {struct smu7_smumgr smu7_data; - -struct fiji_smu_avfs avfs;struct SMU73_Discrete_DpmTable smc_state_table;struct SMU73_Discrete_Ulv ulv_setting;struct SMU73_Discrete_PmFuses power_tune_table;@@ -47,7 +38,5 @@ struct fiji_smumgr { }; - -#endif drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +1
-1@@ -1498,7 +1498,7 @@ static int polaris10_populate_avfs_parameters(struct pp_hwmgr *hwmgr) table_info->vdd_dep_on_sclk; -if (smu_data->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED ) +if (((struct smu7_smumgr *)smu_data)->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED )return result;drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +1
-1result =atomctrl_get_avfs_information (hwmgr, &avfs_params);@@ -1889,7 +1889,7 @@ int polaris10_thermal_avfs_enable(struct pp_hwmgr *hwmgr) {int ret;struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr- >smumgr); -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); + struct smu7_smumgr *smu_data = (struct smu7_smumgr*)(smumgr->backend);
structsmu7_hwmgr*data = (structsmu7_hwmgr*)(hwmgr-Quoted 1 line
backend);
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c +0
-0if (smu_data->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED )drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +2
-4@@ -60,16 +60,14 @@static const SMU74_Discrete_MemoryLevel avfs_memory_level_polaris10 = {0x100ea446 ,0 ,0x30750000 ,0x01 ,0x01 ,0x01 ,0x00 ,0x00 ,0x64 ,0x00 ,0x00 ,0x1f00 ,0x00 ,0x00 }; -static int polaris10_setup_pwr_virus (struct pp_smumgr *smumgr) {int i; -int result =-1 ; +int result = -EINVAL ;uint32_t reg, data;const PWR_Command_Table *pvirus = pwr_virus_table; -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); - + struct smu7_smumgr *smu_data = (struct smu7_smumgr*)(smumgr->backend);
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1
-1for (i =0 ; i <PWR_VIRUS_TABLE_SIZE ; i++) {switch (pvirus->command) {@@ -86,7 +84,7 @@ static int polaris10_setup_pwr_virus(struct pp_smumgr *smumgr)default :pr_info ("Table Exit with Invalid Command!" ); smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; - result =-1 ; + result = -EINVAL ;break ;drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1
-1} pvirus++;@@ -98,7 +96,7 @@ static int polaris10_setup_pwr_virus(struct pp_smumgr *smumgr)static int polaris10_perform_btc (struct pp_smumgr *smumgr) {int result =0 ; -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend);drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +0
-0if (0 != smu_data->avfs.avfs_btc_param) { if (0 != smu7_send_msg_to_smc_with_parameter(smumgr,
PPSMC_MSG_PerformBtc,smu_data->avfs.avfs_btc_param)) {drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +2
-1@@ -172,10 +170,11 @@ static int polaris10_setup_graphics_level_structure(struct pp_smumgr *smumgr) return 0; } +static int polaris10_avfs_event_mgr (struct pp_smumgr *smumgr,bool SMU_VFT_INTACT ) { -struct polaris10_smumgr *smu_data = (struct polaris10_smumgr *)(smumgr->backend); + struct smu7_smumgr *smu_data = (struct smu7_smumgr*)(smumgr->backend);
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +4
-4switch (smu_data->avfs.avfs_btc_status) {case AVFS_BTC_COMPLETED_PREVIOUSLY :@@ -185,21 +184,21 @@ static int polaris10_setup_graphics_level_structure(struct pp_smumgr *smumgr) smu_data->avfs.avfs_btc_status =AVFS_BTC_DPMTABLESETUP_FAILED ;PP_ASSERT_WITH_CODE (0 ==polaris10_setup_graphics_level_structure (smumgr), - "[AVFS][Polaris10_AVFSEventMgr] Could not Copy Graphics Level table over to SMU", - return -1 ); + "[AVFS][Polaris10_AVFSEventMgr] Could not Copy Graphics Level table over to SMU", + return -EINVAL );if (smu_data->avfs.avfs_btc_param >1 ) { pr_info("[AVFS][Polaris10_AVFSEventMgr] AC BTC has not been successfully verified on Fiji. There may be in this setting."); smu_data->avfs.avfs_btc_status =AVFS_BTC_VIRUS_FAIL ; -PP_ASSERT_WITH_CODE (-1 ==polaris10_setup_pwr_virus (smumgr), +PP_ASSERT_WITH_CODE (0 ==polaris10_setup_pwr_virus (smumgr), "[AVFS][Polaris10_AVFSEventMgr] Could not setup Pwr Virus for AVFS ", - return -1 ); + return -EINVAL ); } smu_data->avfs.avfs_btc_status =AVFS_BTC_FAILED ; PP_ASSERT_WITH_CODE(0 ==
polaris10_perform_btc(smumgr),
"[AVFS][Polaris10_AVFSEventMgr]
Failure atSmuPolaris10_PerformBTC. AVFS Disabled",drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1
-6- return -1); + return -EINVAL); smu_data->avfs.avfs_btc_status =AVFS_BTC_ENABLEAVFS ;break ;@@ -377,11 +376,6 @@ static int polaris10_smu_init(struct pp_smumgr *smumgr)if (smu7_init (smumgr))return -EINVAL ; -if (polaris10_is_hw_avfs_present (smumgr)) - smu_data->avfs.avfs_btc_status =AVFS_BTC_BOOT ; -else - smu_data->avfs.avfs_btc_status =AVFS_BTC_NOTSUPPORTED ; -for (i =0 ; i <SMU74_MAX_LEVELS_GRAPHICS ; i++)smu_data->activity_target[i] =
PPPOLARIS10_TARGETACTIVITY_DFLT;drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +0
-0@@ -411,4 +405,5 @@ static int polaris10_smu_init(struct pp_smumgr *smumgr) .get_mac_definition = polaris10_get_mac_definition, .is_dpm_running = polaris10_is_dpm_running, .populate_requested_graphic_levels =
polaris10_populate_requested_graphic_levels,drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +1
-0+ .is_hw_avfs_present = polaris10_is_hw_avfs_present, };drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.h +0
-7@@ -32,11 +32,6 @@#define SMC_RAM_END 0x40000 -struct polaris10_avfs { -enum AVFS_BTC_STATUS avfs_btc_status; -uint32_t avfs_btc_param; -}; -struct polaris10_pt_defaults {uint8_t SviLoadLineEn;uint8_t SviLoadLineVddC;@@ -51,8 +46,6 @@ struct polaris10_pt_defaults {uint16_t BAPMTI_RC [SMU74_DTE_ITERATIONS *SMU74_DTE_SOURCES *SMU74_DTE_SINKS ]; }; - -struct polaris10_range_table {uint32_t trans_lower_frequency;/* in 10khz */ drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.h +2
-3uint32_t trans_upper_frequency;@@ -61,14 +54,13 @@ struct polaris10_range_table {struct polaris10_smumgr {struct smu7_smumgr smu7_data;uint8_t protected_mode; -struct polaris10_avfs avfs;SMU74_Discrete_DpmTable smc_state_table;struct SMU74_Discrete_Ulv ulv_setting;struct SMU74_Discrete_PmFuses power_tune_table;struct polaris10_range_table range_table[NUM_SCLK_RANGE ];const struct polaris10_pt_defaults *power_tune_defaults; -uint32_t activity_target[SMU74_MAX_LEVELS_GRAPHICS ]; -uint32_t bif_sclk_table[SMU74_MAX_LEVELS_LINK ]; +uint32_t activity_target[SMU74_MAX_LEVELS_GRAPHICS ]; +uint32_t bif_sclk_table[SMU74_MAX_LEVELS_LINK ]; };drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +0
-1@@ -540,7 +540,6 @@ int smu7_upload_smu_firmware_image(struct pp_smumgr *smumgr)return result; } -int smu7_init (struct pp_smumgr *smumgr) {drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.c +5
-0struct smu7_smumgr *smu_data;@@ -596,6 +595,11 @@ int smu7_init(struct pp_smumgr *smumgr) (cgs_handle_t)smu_data->smu_buffer.handle); return -EINVAL); +if (smum_is_hw_avfs_present (smumgr)) + smu_data->avfs.avfs_btc_status =AVFS_BTC_BOOT ; +else + smu_data->avfs.avfs_btc_status =AVFS_BTC_NOTSUPPORTED ; +return 0 ; }drivers/gpu/drm/amd/powerplay/smumgr/smu7_smumgr.h +7
-1@@ -37,6 +37,11 @@ struct smu7_buffer_entry {unsigned long handle; }; +struct smu7_avfs { +enum AVFS_BTC_STATUS avfs_btc_status; +uint32_t avfs_btc_param; +}; +struct smu7_smumgr {uint8_t *header;uint8_t *mec_image;@@ -50,7 +55,8 @@ struct smu7_smumgr {uint32_t arb_table_start;uint32_t ulv_setting_starts;uint8_t security_hard_key; -uint32_t acpi_optimization; +uint32_t acpi_optimization; +struct smu7_avfs avfs; };drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +5
-0@@ -402,3 +402,11 @@ int smum_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr, return 0; } + +bool smum_is_hw_avfs_present (struct pp_smumgr *smumgr) +{ +if (smumgr->smumgr_funcs->is_hw_avfs_present) + return smumgr->smumgr_funcs-Quoted 1 line
is_hw_avfs_present(smumgr);
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c int smum_populate_requested_graphic_levels(struct pp_hwmgr *hwmgr, · line 412
Quoted 4 lines
drivers/gpu/drm/amd/powerplay/smumgr/smumgr.c +3
-0+ +return false; +}
With the above newline fixed,
Quoted 7 lines
--
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
PATCH 4/4 drm/amd/powerplay: add avfs check for old asics on Vi.
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +9 -0
@@ -4660,6 +4660,15 @@ static int smu7_set_power_profile_state(struct pp_hwmgr *hwmgr,static int smu7_avfs_control (struct pp_hwmgr *hwmgr,bool enable) { +struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr->smumgr); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); + +if (smu_data ==NULL ) +return -EINVAL ; + +if (smu_data->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED ) +return 0 ; +if (enable) {if (!PHM_READ_VFPF_INDIRECT_FIELD (hwmgr->device,CGS_IND_REG__SMC ,FEATURE_STATUS ,AVS_ON ))
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): 1499076813-9833-4-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 4/4] drm/amd/powerplay: add avfs check for old asics on Vi.
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Monday, July 03, 2017 6:14 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 4/4] drm/amd/powerplay: add avfs check for old asics on Vi.
Quoted 2 lines
Change-Id I1737ba27ae2a8f5c579ccb541ced9cb979ffd1ffSigned-off-by Rex Zhu <[email protected]>
Quoted 32 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 9 +++++++++ 1 file changed, 9 insertions(+)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +9
-0@@ -4660,6 +4660,15 @@ static int smu7_set_power_profile_state(structpp_hwmgr *hwmgr, static int smu7_avfs_control(struct pp_hwmgr *hwmgr, bool enable) { + struct pp_smumgr *smumgr = (struct pp_smumgr *)(hwmgr- >smumgr); +struct smu7_smumgr *smu_data = (struct smu7_smumgr *)(smumgr->backend); + +if (smu_data ==NULL ) +return -EINVAL ; + +if (smu_data->avfs.avfs_btc_status ==AVFS_BTC_NOTSUPPORTED ) +return 0 ; +drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0
-0if (enable) { if (!PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC, FEATURE_STATUS,
AVS_ON))
--
1.9.1
Quoted 4 lines
_______________________________________________
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
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Monday, July 03, 2017 6:14 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 1/4] drm/amd/powerplay: fix avfs state update error on polaris.
Quoted 4 lines
always lead to print avfs broken in dmesg.
Change-Id If4b2d9607acf5a600b496204a5cc79a2d867260cSigned-off-by Rex Zhu <[email protected]>
Quoted 35 lines
--- drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +3
-2@@ -200,15 +200,16 @@ static int polaris10_setup_graphics_level_structure(struct pp_smumgr *smumgr) PP_ASSERT_WITH_CODE(0 == polaris10_perform_btc(smumgr ), "[AVFS][Polaris10_AVFSEventMgr] Failure at SmuPolaris10_PerformBTC. AVFS Disabled", return -1); - + smu_data->avfs.avfs_btc_status =AVFS_BTC_ENABLEAVFS ;break ;case AVFS_BTC_DISABLED : +case AVFS_BTC_ENABLEAVFS :case AVFS_BTC_NOTSUPPORTED :break ;default : -pr_info ("[AVFS] Something is broken. See log!" ); + pr_err("AVFS failed status is %x!\n", smu_data-Quoted 1 line
avfs.avfs_btc_status);
drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smumgr.c +0
-1break ; } --1.9.1
Quoted 4 lines
_______________________________________________
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