Commit 74ce291a authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau/therm: kill some over-zealous debugging 



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 15689c3c

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

+0 −3
Original line number Diff line number Diff line
@@ -95,7 +95,6 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode) 
	int duty;



	spin_lock_irqsave(&priv->lock, flags);

	nv_debug(therm, "FAN speed check\n");

	if (mode < 0)

		mode = priv->mode;

	priv->mode = mode;
@@ -125,8 +124,6 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode) 
done:

	if (list_empty(&priv->alarm.head) && (mode == NOUVEAU_THERM_CTRL_AUTO))

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

	else if (!list_empty(&priv->alarm.head))

		nv_debug(therm, "therm fan alarm list is not empty\n");

	spin_unlock_irqrestore(&priv->lock, flags);

}

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

+0 −2
Original line number Diff line number Diff line
@@ -180,8 +180,6 @@ alarm_timer_callback(struct nouveau_alarm *alarm) 


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



	nv_debug(therm, "polling the internal temperature\n");



	nouveau_therm_threshold_hyst_polling(therm, &sensor->thrs_fan_boost,

					     NOUVEAU_THERM_THRS_FANBOOST);

drivers/gpu/drm/nouveau/core/subdev/timer/nv04.c

+1 −9
Original line number Diff line number Diff line
@@ -119,16 +119,8 @@ nv04_timer_alarm_cancel(struct nouveau_timer *ptimer, 
{

	struct nv04_timer_priv *priv = (void *)ptimer;

	unsigned long flags;



	/* avoid deleting an entry while the alarm intr is running */

	spin_lock_irqsave(&priv->lock, flags);



	/* delete the alarm from the list */

	list_del(&alarm->head);



	/* reset the head so as list_empty returns 1 */

	INIT_LIST_HEAD(&alarm->head);



	list_del_init(&alarm->head);

	spin_unlock_irqrestore(&priv->lock, flags);

}