[PATCH] drm/amd/powerplay: don't succeed in getters if fan is missing

Edward O'Callaghan funfunctor at folklore1984.net
Sun Oct 30 05:05:14 UTC 2016


Reviewed-by: Edward O'Callaghan <funfunctor at folklore1984.net>

On 10/30/2016 07:32 AM, Grazvydas Ignotas wrote:
> Otherwise callers end up using uninitialized data.
> 
> Signed-off-by: Grazvydas Ignotas <notasas at gmail.com>
> ---
>  drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
> index fb6c6f6..29d0319 100644
> --- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
> +++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_thermal.c
> @@ -30,7 +30,7 @@ int smu7_fan_ctrl_get_fan_speed_info(struct pp_hwmgr *hwmgr,
>  		struct phm_fan_speed_info *fan_speed_info)
>  {
>  	if (hwmgr->thermal_controller.fanInfo.bNoFan)
> -		return 0;
> +		return -ENODEV;
>  
>  	fan_speed_info->supports_percent_read = true;
>  	fan_speed_info->supports_percent_write = true;
> @@ -60,7 +60,7 @@ int smu7_fan_ctrl_get_fan_speed_percent(struct pp_hwmgr *hwmgr,
>  	uint64_t tmp64;
>  
>  	if (hwmgr->thermal_controller.fanInfo.bNoFan)
> -		return 0;
> +		return -ENODEV;
>  
>  	duty100 = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
>  			CG_FDO_CTRL1, FMAX_DUTY100);
> @@ -89,7 +89,7 @@ int smu7_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed)
>  	if (hwmgr->thermal_controller.fanInfo.bNoFan ||
>  			(hwmgr->thermal_controller.fanInfo.
>  				ucTachometerPulsesPerRevolution == 0))
> -		return 0;
> +		return -ENODEV;
>  
>  	tach_period = PHM_READ_VFPF_INDIRECT_FIELD(hwmgr->device, CGS_IND_REG__SMC,
>  			CG_TACH_STATUS, TACH_PERIOD);
> 

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: OpenPGP digital signature
URL: <https://lists.freedesktop.org/archives/amd-gfx/attachments/20161030/4852e845/attachment-0001.sig>


More information about the amd-gfx mailing list