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

Commit 6fb192c0 authored by Evan Quan's avatar Evan Quan Committed by Greg Kroah-Hartman
Browse files

drm/amd/pm: avoid false alarm due to confusing softwareshutdowntemp setting 



commit 971df65cbf32da9bc9af52c1196ca504dd316086 upstream.

Normally softwareshutdowntemp should be greater than Thotspotlimit.
However, on some VEGA10 ASIC, the softwareshutdowntemp is 91C while
Thotspotlimit is 105C. This seems not right and may trigger some
false alarms.

Signed-off-by: default avatarEvan Quan <evan.quan@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f84804af

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

+12 −2
Original line number Original line Diff line number Diff line
@@ -375,8 +375,18 @@ static int vega10_thermal_set_temperature_range(struct pp_hwmgr *hwmgr, 
	/* compare them in unit celsius degree */

	/* compare them in unit celsius degree */

	if (low < range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES)

	if (low < range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES)

		low = range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES;

		low = range->min / PP_TEMPERATURE_UNITS_PER_CENTIGRADES;



	/*

	 * As a common sense, usSoftwareShutdownTemp should be bigger

	 * than ThotspotLimit. For any invalid usSoftwareShutdownTemp,

	 * we will just use the max possible setting VEGA10_THERMAL_MAXIMUM_ALERT_TEMP

	 * to avoid false alarms.

	 */

	if ((tdp_table->usSoftwareShutdownTemp >

	     range->hotspot_crit_max / PP_TEMPERATURE_UNITS_PER_CENTIGRADES)) {

		if (high > tdp_table->usSoftwareShutdownTemp)

		if (high > tdp_table->usSoftwareShutdownTemp)

			high = tdp_table->usSoftwareShutdownTemp;

			high = tdp_table->usSoftwareShutdownTemp;

	}





	if (low > high)

	if (low > high)

		return -EINVAL;

		return -EINVAL;