Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c755d9a authored by Tom St Denis's avatar Tom St Denis Committed by Alex Deucher
Browse files

drm/amd/powerplay: Tidy up vega10_fan_ctrl_get_fan_speed_rpm() 



Signed-off-by: default avatarTom St Denis <tom.stdenis@amd.com>
Reviewed-by: default avatarRex Zhu <Rex.Zhu@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent f85a49bd

drivers/gpu/drm/amd/powerplay/hwmgr/vega10_thermal.c

+6 −5
Original line number Diff line number Diff line
@@ -104,14 +104,15 @@ int vega10_fan_ctrl_get_fan_speed_rpm(struct pp_hwmgr *hwmgr, uint32_t *speed) 
	if (hwmgr->thermal_controller.fanInfo.bNoFan)

		return -1;



	if (data->smu_features[GNLD_FAN_CONTROL].supported)

	if (data->smu_features[GNLD_FAN_CONTROL].supported) {

		result = vega10_get_current_rpm(hwmgr, speed);

	else {

	} else {

		uint32_t reg = soc15_get_register_offset(THM_HWID, 0,

				mmCG_TACH_STATUS_BASE_IDX, mmCG_TACH_STATUS);

		tach_period = (cgs_read_register(hwmgr->device,

				reg) & CG_TACH_STATUS__TACH_PERIOD_MASK) >>

				CG_TACH_STATUS__TACH_PERIOD__SHIFT;

		tach_period =

			CGS_REG_GET_FIELD(cgs_read_register(hwmgr->device, reg),

					  CG_TACH_STATUS,

					  TACH_PERIOD);



		if (tach_period == 0)

			return -EINVAL;