drm/amd/powerplay: delete dead code in powerplay.
Subsystems (2)
PATCH 1/5 drm/amd/powerplay: delete dead code in powerplay.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 28 ------------------------ drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 2 -- 2 files changed, 30 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +0 -28
@@ -4522,32 +4522,6 @@ static int smu7_get_clock_by_type(struct pp_hwmgr *hwmgr, enum amd_pp_clock_typereturn 0 ; } -static int smu7_request_firmware (struct pp_hwmgr *hwmgr) -{ -int ret; -struct cgs_firmware_info info = {0 }; - - ret =cgs_get_firmware_info (hwmgr->device, -smu7_convert_fw_type_to_cgs (UCODE_ID_SMU ), - &info); -if (ret || !info.kptr) -return -EINVAL ; - -return 0 ; -} - -static int smu7_release_firmware (struct pp_hwmgr *hwmgr) -{ -int ret; - - ret =cgs_rel_firmware (hwmgr->device, -smu7_convert_fw_type_to_cgs (UCODE_ID_SMU )); -if (ret) -return -EINVAL ; - -return 0 ; -} -static void smu7_find_min_clock_masks (struct pp_hwmgr *hwmgr,uint32_t *sclk_mask,uint32_t *mclk_mask,uint32_t min_sclk,uint32_t min_mclk)
@@ -4691,8 +4665,6 @@ static int smu7_avfs_control(struct pp_hwmgr *hwmgr, bool enable) .get_clock_by_type = smu7_get_clock_by_type, .read_sensor = smu7_read_sensor, .dynamic_state_management_disable = smu7_disable_dpm_tasks, - .request_firmware = smu7_request_firmware, - .release_firmware = smu7_release_firmware, .set_power_profile_state = smu7_set_power_profile_state, .avfs_control = smu7_avfs_control, .disable_smc_firmware_ctf = smu7_thermal_disable_alert,
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +0 -2
@@ -368,8 +368,6 @@ struct pp_hwmgr_func {int (*get_mclk_od)(struct pp_hwmgr *hwmgr);int (*set_mclk_od)(struct pp_hwmgr *hwmgr,uint32_t value);int (*read_sensor)(struct pp_hwmgr *hwmgr,int idx,void *value,int *size); -int (*request_firmware)(struct pp_hwmgr *hwmgr); -int (*release_firmware)(struct pp_hwmgr *hwmgr);int (*set_power_profile_state)(struct pp_hwmgr *hwmgr,struct amd_pp_profile *request);int (*avfs_control)(struct pp_hwmgr *hwmgr,bool enable);
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): 1493899380-5587-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/5 drm/amd/powerplay: Setup sw CTF to allow graceful exit when temperature exceeds maximum.
cherry-pick from amd windows driver.
--- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c | 73 +++++++++++++--------- 1 file changed, 45 insertions(+), 28 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c +45 -28
@@ -381,14 +381,10 @@ int vega10_thermal_get_temperature(struct pp_hwmgr *hwmgr) temp =cgs_read_register (hwmgr->device, reg); - temp = (temp &CG_MULT_THERMAL_STATUS__CTF_TEMP_MASK ) >> -CG_MULT_THERMAL_STATUS__CTF_TEMP__SHIFT ; + temp = (temp &CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP_MASK ) >> +CG_MULT_THERMAL_STATUS__ASIC_MAX_TEMP__SHIFT ; -/* Bit 9 means the reading is lower than the lowest usable value. */ -if (temp &0x200 ) - temp =VEGA10_THERMAL_MAXIMUM_TEMP_READING ; -else - temp = temp &0x1ff ; + temp = temp &0x1ff ; temp *=PP_TEMPERATURE_UNITS_PER_CENTIGRADES ;
@@ -424,23 +420,28 @@ static int vega10_thermal_set_temperature_range(struct pp_hwmgr *hwmgr, mmTHM_THERMAL_INT_CTRL_BASE_IDX, mmTHM_THERMAL_INT_CTRL); val =cgs_read_register (hwmgr->device, reg); - val &= ~(THM_THERMAL_INT_CTRL__DIG_THERM_INTH_MASK ); - val |= (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) << -THM_THERMAL_INT_CTRL__DIG_THERM_INTH__SHIFT ; - val &= ~(THM_THERMAL_INT_CTRL__DIG_THERM_INTL_MASK ); - val |= (low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) << -THM_THERMAL_INT_CTRL__DIG_THERM_INTL__SHIFT ; + + val &= (~THM_THERMAL_INT_CTRL__MAX_IH_CREDIT_MASK ); + val |= (5 <<THM_THERMAL_INT_CTRL__MAX_IH_CREDIT__SHIFT ); + + val &= (~THM_THERMAL_INT_CTRL__THERM_IH_HW_ENA_MASK ); + val |= (1 <<THM_THERMAL_INT_CTRL__THERM_IH_HW_ENA__SHIFT ); + + val &= (~THM_THERMAL_INT_CTRL__DIG_THERM_INTH_MASK ); + val |= ((high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + <<THM_THERMAL_INT_CTRL__DIG_THERM_INTH__SHIFT ); + + val &= (~THM_THERMAL_INT_CTRL__DIG_THERM_INTL_MASK ); + val |= ((low /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) + <<THM_THERMAL_INT_CTRL__DIG_THERM_INTL__SHIFT ); + + val = val & (~THM_THERMAL_INT_CTRL__THERM_TRIGGER_MASK_MASK ); +cgs_write_register (hwmgr->device, reg, val); reg =soc15_get_register_offset (THM_HWID ,0 , mmTHM_TCON_HTC_BASE_IDX, mmTHM_TCON_HTC); - val =cgs_read_register (hwmgr->device, reg); - val &= ~(THM_TCON_HTC__HTC_TMP_LMT_MASK ); - val |= (high /PP_TEMPERATURE_UNITS_PER_CENTIGRADES ) << -THM_TCON_HTC__HTC_TMP_LMT__SHIFT ; -cgs_write_register (hwmgr->device, reg, val); -return 0 ; }
@@ -482,18 +483,28 @@ static int vega10_thermal_initialize(struct pp_hwmgr *hwmgr)static int vega10_thermal_enable_alert (struct pp_hwmgr *hwmgr) {struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr->backend); +uint32_t val =0 ; +uint32_t reg;if (data->smu_features[GNLD_FW_CTF ].supported) {if (data->smu_features[GNLD_FW_CTF ].enabled)printk ("[Thermal_EnableAlert] FW CTF Already Enabled!\n" ); + +PP_ASSERT_WITH_CODE (!vega10_enable_smc_features (hwmgr->smumgr, + true, + data->smu_features[GNLD_FW_CTF ].smu_feature_bitmap), +"Attempt to Enable FW CTF feature Failed!" , + return -1 ); + data->smu_features[GNLD_FW_CTF ].enabled = true; } -PP_ASSERT_WITH_CODE (!vega10_enable_smc_features (hwmgr->smumgr, - true, - data->smu_features[GNLD_FW_CTF ].smu_feature_bitmap), -"Attempt to Enable FW CTF feature Failed!" , - return -1 ); - data->smu_features[GNLD_FW_CTF ].enabled = true; + val |= (1 <<THM_THERMAL_INT_ENA__THERM_INTH_CLR__SHIFT ); + val |= (1 <<THM_THERMAL_INT_ENA__THERM_INTL_CLR__SHIFT ); + val |= (1 <<THM_THERMAL_INT_ENA__THERM_TRIGGER_CLR__SHIFT ); + + reg =soc15_get_register_offset (THM_HWID ,0 , mmTHM_THERMAL_INT_ENA_BASE_IDX, mmTHM_THERMAL_INT_ENA); +cgs_write_register (hwmgr->device, reg, val); +return 0 ; }
@@ -504,18 +515,24 @@ static int vega10_thermal_enable_alert(struct pp_hwmgr *hwmgr)int vega10_thermal_disable_alert (struct pp_hwmgr *hwmgr) {struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr->backend); +uint32_t reg;if (data->smu_features[GNLD_FW_CTF ].supported) {if (!data->smu_features[GNLD_FW_CTF ].enabled)printk ("[Thermal_EnableAlert] FW CTF Already disabled!\n" ); - } -PP_ASSERT_WITH_CODE (!vega10_enable_smc_features (hwmgr->smumgr, + +PP_ASSERT_WITH_CODE (!vega10_enable_smc_features (hwmgr->smumgr, false, data->smu_features[GNLD_FW_CTF ].smu_feature_bitmap),"Attempt to disable FW CTF feature Failed!" , return -1 ); - data->smu_features[GNLD_FW_CTF ].enabled = false; + data->smu_features[GNLD_FW_CTF ].enabled = false; + } + + reg =soc15_get_register_offset (THM_HWID ,0 , mmTHM_THERMAL_INT_ENA_BASE_IDX, mmTHM_THERMAL_INT_ENA); +cgs_write_register (hwmgr->device, reg,0 ); +return 0 ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/5 drm/amd/powerplay: fix sclk/mclk level can't be set manually on vega10.
In reply to a message not in the archive--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 61 +++++++++++----------- 1 file changed, 31 insertions(+), 30 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +31 -30
@@ -4189,55 +4189,56 @@ static int vega10_force_clock_level(struct pp_hwmgr *hwmgr,switch (type) {case PP_SCLK : -if (data->registry_data.sclk_dpm_key_disabled) -break ; -for (i =0 ; i <32 ; i++) {if (mask & (1 << i))break ; } + data->smc_state_table.gfx_boot_level = i; -PP_ASSERT_WITH_CODE (!smum_send_msg_to_smc_with_parameter ( - hwmgr->smumgr, - PPSMC_MSG_SetSoftMinGfxclkByIndex, - i), -"Failed to set soft min sclk index!" , - return -1 ); +for (i =31 ; i >=0 ; i--) { +if (mask & (1 << i)) +break ; + } + data->smc_state_table.gfx_max_level = i; + +PP_ASSERT_WITH_CODE (!vega10_upload_dpm_bootup_level (hwmgr), +"Failed to upload boot level to lowest!" , + return -EINVAL ); + +PP_ASSERT_WITH_CODE (!vega10_upload_dpm_max_level (hwmgr), +"Failed to upload dpm max level to highest!" , + return -EINVAL );break ;case PP_MCLK : -if (data->registry_data.mclk_dpm_key_disabled) -break ; -for (i =0 ; i <32 ; i++) {if (mask & (1 << i))break ; } -PP_ASSERT_WITH_CODE (!smum_send_msg_to_smc_with_parameter ( - hwmgr->smumgr, - PPSMC_MSG_SetSoftMinUclkByIndex, - i), -"Failed to set soft min mclk index!" , - return -1 ); -break ; - -case PP_PCIE : -if (data->registry_data.pcie_dpm_key_disabled) -break ; -for (i =0 ; i <32 ; i++) {if (mask & (1 << i))break ; } + data->smc_state_table.mem_boot_level = i; + +for (i =31 ; i >=0 ; i--) { +if (mask & (1 << i)) +break ; + } + data->smc_state_table.mem_max_level = i; + +PP_ASSERT_WITH_CODE (!vega10_upload_dpm_bootup_level (hwmgr), +"Failed to upload boot level to lowest!" , + return -EINVAL ); + +PP_ASSERT_WITH_CODE (!vega10_upload_dpm_max_level (hwmgr), +"Failed to upload dpm max level to highest!" , + return -EINVAL ); -PP_ASSERT_WITH_CODE (!smum_send_msg_to_smc_with_parameter ( - hwmgr->smumgr, - PPSMC_MSG_SetMinLinkDpmByIndex, - i), -"Failed to set min pcie index!" , - return -1 );break ; + +case PP_PCIE :default :break ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/5 drm/amdgpu: refine pwm1_enable's callback function.
In reply to a message not in the archive--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +6 -4
@@ -861,14 +861,16 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev, {struct amdgpu_device *adev =dev_get_drvdata (dev);u32 pwm_mode =0 ; +u32 size =0 ;if (!adev->pp_enabled && !adev->pm.funcs->get_fan_control_mode)return -EINVAL ; pwm_mode =amdgpu_dpm_get_fan_control_mode (adev); -/* never 0 (full-speed), fuse or smc-controlled always */ -return sprintf (buf,"%i\n" , pwm_mode ==FDO_PWM_MODE_STATIC ?1 :2 ); + return sprintf(buf + size, " 0: manual %s \n 1: static %s \n", + (pwm_mode == 0) ? "*" : "", + (pwm_mode == 1) ? "*" : "" } static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,
@@ -888,10 +890,10 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,return err;switch (value) { -case 1 :/* manual, percent-based */ +case 1 :amdgpu_dpm_set_fan_control_mode (adev,FDO_PWM_MODE_STATIC );break ; -default :/* disable */ +case 0 :/* disable */ amdgpu_dpm_set_fan_control_mode (adev,0 );break ; }
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 5/5 drm/amd/powerplay: add manual/auto fan control mode switch on vega10.
In reply to a message not in the archiveChange-Id: I3d3e06e2cb503d53ec57612b1866a83d448b5b60
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 23 +++++++++++++--------- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 1 + 2 files changed, 15 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +14 -9
@@ -3921,22 +3921,27 @@ static int vega10_dpm_force_dpm_level(struct pp_hwmgr *hwmgr,static int vega10_set_fan_control_mode (struct pp_hwmgr *hwmgr,uint32_t mode) { -if (mode) { -/* stop auto-manage */ -if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, +int result; + +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl)) -vega10_fan_ctrl_stop_smc_fan_control (hwmgr); -vega10_fan_ctrl_set_static_mode (hwmgr, mode); - }else -/* restart auto-manage */ -vega10_fan_ctrl_reset_fan_speed_to_default (hwmgr); +vega10_fan_ctrl_stop_smc_fan_control (hwmgr); -return 0 ; +if (mode) { + result =vega10_fan_ctrl_set_static_mode (hwmgr, mode); +if (!result) + result =vega10_fan_ctrl_start_smc_fan_control (hwmgr); + } +return result; }static int vega10_get_fan_control_mode (struct pp_hwmgr *hwmgr) {uint32_t reg; +struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr->backend); + +if (data->smu_features[GNLD_FAN_CONTROL ].enabled == false) +return 0 ;if (hwmgr->fan_ctrl_is_in_default_mode) {return hwmgr->fan_ctrl_default_mode;
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h +1 -0
@@ -79,6 +79,7 @@ extern int vega10_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr,extern int vega10_fan_ctrl_stop_smc_fan_control (struct pp_hwmgr *hwmgr);extern uint32_t smu7_get_xclk (struct pp_hwmgr *hwmgr);extern int vega10_thermal_disable_alert (struct pp_hwmgr *hwmgr); +int vega10_fan_ctrl_start_smc_fan_control (struct pp_hwmgr *hwmgr);#endif
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): 1493899380-5587-5-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Deucher, Alexander
Reviewed-by Alex DeucherRE: [PATCH 5/5] drm/amd/powerplay: add manual/auto fan control mode switch on vega10.
Quoted 10 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Thursday, May 04, 2017 8:03 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH 5/5] drm/amd/powerplay: add manual/auto fan control mode switch on vega10.Signed-off-by Rex Zhu <[email protected]>
Series is:
Quoted 70 lines
Change-Id: I3d3e06e2cb503d53ec57612b1866a83d448b5b60
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 23 +++++++++++++--------- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 1 + 2 files changed, 15 insertions(+), 9 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +11
-9@@ -3921,22 +3921,27 @@ static int vega10_dpm_force_dpm_level(structpp_hwmgr *hwmgr, static int vega10_set_fan_control_mode(struct pp_hwmgr *hwmgr, uint32_t mode) { - if (mode) { - /* stop auto-manage */ - if (phm_cap_enabled(hwmgr- >platform_descriptor.platformCaps, + int result; + +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl)) - vega10_fan_ctrl_stop_smc_fan_control(hwmgr); -vega10_fan_ctrl_set_static_mode (hwmgr ,mode ); - } else -/* restart auto-manage */ -vega10_fan_ctrl_reset_fan_speed_to_default (hwmgr ); +vega10_fan_ctrl_stop_smc_fan_control (hwmgr); -return 0 ; +if (mode) { + result =vega10_fan_ctrl_set_static_mode (hwmgr, mode); +if (!result) + result =vega10_fan_ctrl_start_smc_fan_control (hwmgr); + } +return result; }static int vega10_get_fan_control_mode (struct pp_hwmgr *hwmgr) {uint32_t reg; + struct vega10_hwmgr *data = (struct vega10_hwmgr *)(hwmgr-Quoted 1 line
backend);
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +3
-0+ +if (data->smu_features[GNLD_FAN_CONTROL ].enabled == false) +return 0 ;if (hwmgr->fan_ctrl_is_in_default_mode) {return hwmgr->fan_ctrl_default_mode;drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h +1
-0@@ -79,6 +79,7 @@ extern int vega10_fan_ctrl_get_fan_speed_rpm(structpp_hwmgr *hwmgr, extern int vega10_fan_ctrl_stop_smc_fan_control(struct pp_hwmgr *hwmgr);extern uint32_t smu7_get_xclk (struct pp_hwmgr *hwmgr);extern int vega10_thermal_disable_alert (struct pp_hwmgr *hwmgr); +int vega10_fan_ctrl_start_smc_fan_control (struct pp_hwmgr *hwmgr);#endif
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