Commit 10e2ca34 authored by Hawking Zhang's avatar Hawking Zhang Committed by Alex Deucher
Browse files

drm/amd/powerplay: bypass fan table setup if no fan connected 



If vBIOS noFan bit is set, the fan table parameters in thermal controller
will not get initialized. The driver should avoid to use these uninitialized
parameter to do calculation. Otherwise, it may trigger divide 0 error.

Signed-off-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 1cd99a8d

drivers/gpu/drm/amd/powerplay/smumgr/fiji_smc.c

+6 −0
Original line number Diff line number Diff line
@@ -1958,6 +1958,12 @@ int fiji_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) 
	int res;

	uint64_t tmp64;



	if (hwmgr->thermal_controller.fanInfo.bNoFan) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_MicrocodeFanControl);

		return 0;

	}



	if (smu_data->smu7_data.fan_table_start == 0) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

				PHM_PlatformCaps_MicrocodeFanControl);

drivers/gpu/drm/amd/powerplay/smumgr/iceland_smc.c

+6 −0
Original line number Diff line number Diff line
@@ -2006,6 +2006,12 @@ int iceland_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) 
	if (!phm_cap_enabled(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl))

		return 0;



	if (hwmgr->thermal_controller.fanInfo.bNoFan) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_MicrocodeFanControl);

		return 0;

	}



	if (0 == smu7_data->fan_table_start) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_MicrocodeFanControl);

		return 0;

drivers/gpu/drm/amd/powerplay/smumgr/polaris10_smc.c

+6 −0
Original line number Diff line number Diff line
@@ -1885,6 +1885,12 @@ int polaris10_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) 
	int res;

	uint64_t tmp64;



	if (hwmgr->thermal_controller.fanInfo.bNoFan) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_MicrocodeFanControl);

		return 0;

	}



	if (smu_data->smu7_data.fan_table_start == 0) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

				PHM_PlatformCaps_MicrocodeFanControl);

drivers/gpu/drm/amd/powerplay/smumgr/tonga_smc.c

+6 −0
Original line number Diff line number Diff line
@@ -2496,6 +2496,12 @@ int tonga_thermal_setup_fan_table(struct pp_hwmgr *hwmgr) 
					PHM_PlatformCaps_MicrocodeFanControl))

		return 0;



	if (hwmgr->thermal_controller.fanInfo.bNoFan) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

			PHM_PlatformCaps_MicrocodeFanControl);

		return 0;

	}



	if (0 == smu_data->smu7_data.fan_table_start) {

		phm_cap_unset(hwmgr->platform_descriptor.platformCaps,

					PHM_PlatformCaps_MicrocodeFanControl);

CRA Git | Maintained and supported by SUSTech CRA and CCSE