diff --git a/[refs] b/[refs]
index 281cbe5a8ead..4a8b1828cf31 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f1aa4a1de5e13b794a7e31efc0b3ddcda6926c56
+refs/heads/master: 3600ad5e1b343f2c259901f736c717f5bc4deb50
diff --git a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
index 820e09706578..bf9b3cefb514 100644
--- a/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
+++ b/trunk/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
@@ -58,11 +58,18 @@ static void
 nouveau_therm_temp_safety_checks(struct nouveau_therm *therm)
 {
 	struct nouveau_therm_priv *priv = (void *)therm;
+	struct nvbios_therm_sensor *s = &priv->bios_sensor;
 
 	if (!priv->bios_sensor.slope_div)
 		priv->bios_sensor.slope_div = 1;
 	if (!priv->bios_sensor.offset_den)
 		priv->bios_sensor.offset_den = 1;
+
+	/* enforce a minimum hysteresis on thresholds */
+	s->thrs_fan_boost.hysteresis = max_t(u8, s->thrs_fan_boost.hysteresis, 2);
+	s->thrs_down_clock.hysteresis = max_t(u8, s->thrs_down_clock.hysteresis, 2);
+	s->thrs_critical.hysteresis = max_t(u8, s->thrs_critical.hysteresis, 2);
+	s->thrs_shutdown.hysteresis = max_t(u8, s->thrs_shutdown.hysteresis, 2);
 }
 
 /* must be called with alarm_program_lock taken ! */