drm/amdgpu: refine pwm1_enable call back functions.
Subsystems (2)
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): 1493978213-19943-2-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 2/5 drm/amdgpu: refine pwm1_enable call back functions.
Change-Id: Ie5fe90762f75497fab68b913874956bbeab11e72
--- drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +2 -10
@@ -867,8 +867,7 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev, 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,"%i\n" , pwm_mode); } static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,
@@ -887,14 +886,7 @@ static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,if (err)return err; -switch (value) { -case 1 :/* manual, percent-based */ -amdgpu_dpm_set_fan_control_mode (adev,FDO_PWM_MODE_STATIC ); -break ; -default :/* disable */ -amdgpu_dpm_set_fan_control_mode (adev,0 ); -break ; - } +amdgpu_dpm_set_fan_control_mode (adev, value);return count; }
--
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): [email protected]
A message that is not in the archive (sent off-list or not yet received): 1493978213-19943-5-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 5/5 drm/amd/powerplay: refine pwm1_enable callback functions on CI.
--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +15 -12
@@ -1267,30 +1267,33 @@ static int ci_dpm_set_fan_speed_percent(struct amdgpu_device *adev,static void ci_dpm_set_fan_control_mode (struct amdgpu_device *adev,u32 mode) { -if (mode) { -/* stop auto-manage */ +switch (mode) { +case AMD_FAN_CTRL_NONE :if (adev->pm.dpm.fan.ucode_fan_control)ci_fan_ctrl_stop_smc_fan_control (adev); -ci_fan_ctrl_set_static_mode (adev, mode); - }else { -/* restart auto-manage */ +ci_dpm_set_fan_speed_percent (adev,100 ); +break ; +case AMD_FAN_CTRL_MANUAL : +if (adev->pm.dpm.fan.ucode_fan_control) +ci_fan_ctrl_stop_smc_fan_control (adev); +break ; +case AMD_FAN_CTRL_AUTO :if (adev->pm.dpm.fan.ucode_fan_control)ci_thermal_start_smc_fan_control (adev); -else -ci_fan_ctrl_set_default_mode (adev); +break ; +default : +break ; } }static u32 ci_dpm_get_fan_control_mode (struct amdgpu_device *adev) {struct ci_power_info *pi =ci_get_pi (adev); -u32 tmp;if (pi->fan_is_controlled_by_smc) -return 0 ; - - tmp =RREG32_SMC (ixCG_FDO_CTRL2) &CG_FDO_CTRL2__FDO_PWM_MODE_MASK ; -return (tmp >>CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT ); +return AMD_FAN_CTRL_AUTO ; +else +return AMD_FAN_CTRL_MANUAL ; }#if 0
--
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): CY4PR12MB16874EC46858BE7390DB5D6FFBEB0-rpdhrqHFk06Y0SjTqZDccQdYzm3356FpvxpqHgZTriW3zl9H0oFU5g@public.gmane.org
Deucher, Alexander
Reviewed-byRE: [PATCH 5/5] drm/amd/powerplay: refine pwm1_enable callback functions on CI.
Patch 2 is missing your signed-off-by. With that fixed, the series is:
From: amd-gfx [mailto:amd-gfx-bounces-PD4FTy7X32lNgt0PjOBp9y5qC8QIuHrW@public.gmane.org] On Behalf Of Zhu, Rex
Sent: Friday, May 05, 2017 8:43 AM
To: [email protected]
Cc: Zhu, Rex
Subject: Fw: [PATCH 5/5] drm/amd/powerplay: refine pwm1_enable callback functions on CI.
--- drivers/gpu/drm/amd/amdgpu/ci_dpm.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-)
drivers/gpu/drm/amd/amdgpu/ci_dpm.c +15 -12
@@ -1267,30 +1267,33 @@ static int ci_dpm_set_fan_speed_percent(struct amdgpu_device *adev,static void ci_dpm_set_fan_control_mode (struct amdgpu_device *adev,u32 mode) { -if (mode) { -/* stop auto-manage */ +switch (mode) { +case AMD_FAN_CTRL_NONE :if (adev->pm.dpm.fan.ucode_fan_control)ci_fan_ctrl_stop_smc_fan_control (adev); -ci_fan_ctrl_set_static_mode (adev, mode); - }else { -/* restart auto-manage */ +ci_dpm_set_fan_speed_percent (adev,100 ); +break ; +case AMD_FAN_CTRL_MANUAL : +if (adev->pm.dpm.fan.ucode_fan_control) +ci_fan_ctrl_stop_smc_fan_control (adev); +break ; +case AMD_FAN_CTRL_AUTO :if (adev->pm.dpm.fan.ucode_fan_control)ci_thermal_start_smc_fan_control (adev); -else -ci_fan_ctrl_set_default_mode (adev); +break ; +default : +break ; } }static u32 ci_dpm_get_fan_control_mode (struct amdgpu_device *adev) {struct ci_power_info *pi =ci_get_pi (adev); -u32 tmp;if (pi->fan_is_controlled_by_smc) -return 0 ; - - tmp =RREG32_SMC (ixCG_FDO_CTRL2) &CG_FDO_CTRL2__FDO_PWM_MODE_MASK ; -return (tmp >>CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT ); +return AMD_FAN_CTRL_AUTO ; +else +return AMD_FAN_CTRL_MANUAL ; }#if 0
--
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): [email protected]
A message that is not in the archive (sent off-list or not yet received): 1493978213-19943-4-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 4/5 drm/amd/powerplay: refine pwm1_enable callback functions on vi.
Change-Id: I72d61851630e5d4ff5b3236ca33abac6f5b200c6
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 35 ++++++++++++---------- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 9 +++--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/hwmgr.h | 1 + 4 files changed, 27 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +20 -15
@@ -4334,26 +4334,31 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,static int smu7_set_fan_control_mode (struct pp_hwmgr *hwmgr,uint32_t mode) { -if (mode) { -/* stop auto-manage */ -if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, - PHM_PlatformCaps_MicrocodeFanControl)) -smu7_fan_ctrl_stop_smc_fan_control (hwmgr); -smu7_fan_ctrl_set_static_mode (hwmgr, mode); - }else -/* restart auto-manage */ -smu7_fan_ctrl_reset_fan_speed_to_default (hwmgr); +int result =0 ; -return 0 ; +switch (mode) { +case AMD_FAN_CTRL_NONE : + result =smu7_fan_ctrl_set_fan_speed_percent (hwmgr,100 ); +break ; +case AMD_FAN_CTRL_MANUAL : +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl)) + result =smu7_fan_ctrl_stop_smc_fan_control (hwmgr); +break ; +case AMD_FAN_CTRL_AUTO : + result =smu7_fan_ctrl_set_static_mode (hwmgr, mode); +if (!result) + result =smu7_fan_ctrl_start_smc_fan_control (hwmgr); +break ; +default : +break ; + } +return result; }static int smu7_get_fan_control_mode (struct pp_hwmgr *hwmgr) { -if (hwmgr->fan_ctrl_is_in_default_mode) -return hwmgr->fan_ctrl_default_mode; -else -return PHM_READ_VFPF_INDIRECT_FIELD (hwmgr->device,CGS_IND_REG__SMC , -CG_FDO_CTRL2 ,FDO_PWM_MODE ); +return hwmgr->fan_ctrl_enabled ?AMD_FAN_CTRL_AUTO :AMD_FAN_CTRL_MANUAL ; }static int smu7_get_sclk_od (struct pp_hwmgr *hwmgr)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c +5 -4
@@ -112,10 +112,9 @@ int smu7_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed)*/ int smu7_fan_ctrl_set_static_mode (struct pp_hwmgr *hwmgr,uint32_t mode) { -if (hwmgr->fan_ctrl_is_in_default_mode) { hwmgr->fan_ctrl_default_mode = -PHM_READ_VFPF_INDIRECT_FIELD (hwmgr->device,CGS_IND_REG__SMC , +PHM_READ_VFPF_INDIRECT_FIELD (hwmgr->device,CGS_IND_REG__SMC ,CG_FDO_CTRL2 ,FDO_PWM_MODE ); hwmgr->tmin = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
@@ -149,7 +148,7 @@ int smu7_fan_ctrl_set_default_mode(struct pp_hwmgr *hwmgr)return 0 ; } -static int smu7_fan_ctrl_start_smc_fan_control (struct pp_hwmgr *hwmgr) +int smu7_fan_ctrl_start_smc_fan_control (struct pp_hwmgr *hwmgr) {int result;
@@ -179,6 +178,7 @@ static int smu7_fan_ctrl_start_smc_fan_control(struct pp_hwmgr *hwmgr) PPSMC_MSG_SetFanTemperatureTarget, hwmgr->thermal_controller. advanceFanControlParameters.ucTargetTemperature); + hwmgr->fan_ctrl_enabled = true;return result; }
@@ -186,6 +186,7 @@ static 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->smumgr, PPSMC_StopFanControl); }
@@ -280,7 +281,7 @@ int smu7_fan_ctrl_set_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t speed)PHM_WRITE_VFPF_INDIRECT_FIELD (hwmgr->device,CGS_IND_REG__SMC ,CG_TACH_STATUS ,TACH_PERIOD , tach_period); -return smu7_fan_ctrl_set_static_mode (hwmgr,FDO_PWM_MODE_STATIC ); +return smu7_fan_ctrl_set_static_mode (hwmgr,FDO_PWM_MODE_STATIC_RPM ); }/**
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.h +1 -1
@@ -54,6 +54,6 @@extern int smu7_fan_ctrl_stop_smc_fan_control (struct pp_hwmgr *hwmgr);extern int smu7_thermal_enable_alert (struct pp_hwmgr *hwmgr);extern int smu7_thermal_disable_alert (struct pp_hwmgr *hwmgr); - +extern int smu7_fan_ctrl_start_smc_fan_control (struct pp_hwmgr *hwmgr);#endif
drivers/gpu/drm/amd/powerplay/inc/hwmgr.h +1 -0
@@ -764,6 +764,7 @@ struct pp_hwmgr {struct pp_thermal_controller_info thermal_controller;bool fan_ctrl_is_in_default_mode;uint32_t fan_ctrl_default_mode; +bool fan_ctrl_enabled;uint32_t tmin;struct phm_microcode_version_info microcode_version_info;uint32_t ps_size;
--
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): [email protected]
A message that is not in the archive (sent off-list or not yet received): 1493978213-19943-3-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 3/5 drm/amd/powerplay: refine pwm1_enable callback functions on vega10.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c | 43 ++++++++++++---------- .../gpu/drm/amd/powerplay/hwmgr/vega10_thermal.h | 1 + 2 files changed, 25 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega10_hwmgr.c +24 -19
@@ -3962,32 +3962,37 @@ 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, - 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); +int result =0 ; -return 0 ; +switch (mode) { +case AMD_FAN_CTRL_NONE : + result =vega10_fan_ctrl_set_fan_speed_percent (hwmgr,100 ); +break ; +case AMD_FAN_CTRL_MANUAL : +if (phm_cap_enabled (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_MicrocodeFanControl)) + result =vega10_fan_ctrl_stop_smc_fan_control (hwmgr); +break ; +case AMD_FAN_CTRL_AUTO : + result =vega10_fan_ctrl_set_static_mode (hwmgr, mode); +if (!result) + result =vega10_fan_ctrl_start_smc_fan_control (hwmgr); +break ; +default : +break ; + } +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 (hwmgr->fan_ctrl_is_in_default_mode) { -return hwmgr->fan_ctrl_default_mode; - }else { - reg =soc15_get_register_offset (THM_HWID ,0 , - mmCG_FDO_CTRL2_BASE_IDX, mmCG_FDO_CTRL2); -return (cgs_read_register (hwmgr->device, reg) & -CG_FDO_CTRL2__FDO_PWM_MODE_MASK ) >> -CG_FDO_CTRL2__FDO_PWM_MODE__SHIFT ; - } +if (data->smu_features[GNLD_FAN_CONTROL ].enabled == false) +return AMD_FAN_CTRL_MANUAL ; +else +return AMD_FAN_CTRL_AUTO ; } static int vega10_get_dal_power_level(struct pp_hwmgr *hwmgr,
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
--
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): 1493978213-19943-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
PATCH 1/5 drm/amdgpu: add amd fan ctrl mode define.
--- drivers/gpu/drm/amd/include/amd_shared.h | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/amd/include/amd_shared.h +6 -0
@@ -138,6 +138,12 @@ struct amd_pp_profile {uint8_t down_hyst; }; +enum amd_fan_ctrl_mode { +AMD_FAN_CTRL_NONE =0 , +AMD_FAN_CTRL_MANUAL =1 , +AMD_FAN_CTRL_AUTO =2 , +}; +/* CG flags */ #define AMD_CG_SUPPORT_GFX_MGCG (1 << 0)#define AMD_CG_SUPPORT_GFX_MGLS (1 << 1)
--
1.9.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx