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

Commit 85d9e14c authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes 

deadlock fix.

* 'linux-3.16' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
  drm/nouveau/therm: fix a potential deadlock in the therm monitoring code
parents 1795cd9b bb78e7a1

drivers/gpu/drm/nouveau/core/subdev/therm/temp.c

+3 −3
Original line number Diff line number Diff line
@@ -192,11 +192,11 @@ alarm_timer_callback(struct nouveau_alarm *alarm) 
	nouveau_therm_threshold_hyst_polling(therm, &sensor->thrs_shutdown,

					     NOUVEAU_THERM_THRS_SHUTDOWN);



	spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);



	/* schedule the next poll in one second */

	if (therm->temp_get(therm) >= 0 && list_empty(&alarm->head))

		ptimer->alarm(ptimer, 1000 * 1000 * 1000, alarm);



	spin_unlock_irqrestore(&priv->sensor.alarm_program_lock, flags);

		ptimer->alarm(ptimer, 1000000000ULL, alarm);

}



void