Commit bb78e7a1 authored by Martin Peres's avatar Martin Peres Committed by Ben Skeggs

drm/nouveau/therm: fix a potential deadlock in the therm monitoring code

Signed-off-by: default avatarMartin Peres <martin.peres@free.fr>
Tested-by: default avatarStefan Ringel <mail@stefanringel.de>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 0b4e8e7f
...@@ -192,11 +192,11 @@ alarm_timer_callback(struct nouveau_alarm *alarm) ...@@ -192,11 +192,11 @@ alarm_timer_callback(struct nouveau_alarm *alarm)
nouveau_therm_threshold_hyst_polling(therm, &sensor->thrs_shutdown, nouveau_therm_threshold_hyst_polling(therm, &sensor->thrs_shutdown,
NOUVEAU_THERM_THRS_SHUTDOWN); NOUVEAU_THERM_THRS_SHUTDOWN);
spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);
/* schedule the next poll in one second */ /* schedule the next poll in one second */
if (therm->temp_get(therm) >= 0 && list_empty(&alarm->head)) if (therm->temp_get(therm) >= 0 && list_empty(&alarm->head))
ptimer->alarm(ptimer, 1000 * 1000 * 1000, alarm); ptimer->alarm(ptimer, 1000000000ULL, alarm);
spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);
} }
void void
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment