Attachment 83883 Details for Bug 66177 – [PATCH 5/5] drm/nouveau/therm: survive to suspend/resume cycles

[patch] [PATCH 5/5] drm/nouveau/therm: survive to suspend/resume cycles

0005-drm-nouveau-therm-survive-to-suspend-resume-cycles.patch (text/plain), 5.08 KB, created by Martin Peres on 2013-08-09 08:09:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Peres

Created: 2013-08-09 08:09:14 UTC

Size: 5.08 KB

patch

obsolete

>From 1a8c2f3075d36881bbbfb9ba22e6a4f1d933e634 Mon Sep 17 00:00:00 2001
>From: Martin Peres <martin.peres@labri.fr>
>Date: Fri, 9 Aug 2013 03:12:26 -0400
>Subject: [PATCH 5/5] drm/nouveau/therm: survive to suspend/resume cycles
>
>Therm uses 3 ptimer alarms. Two to drive the fan and one for polling the
>temperature. When suspending/resuming, alarms will never be fired.
>As we are checking if there isn't an alarm pending before rescheduling
>another one, we end up never checking temperature or updating the
>fan speed.
>
>This commit also adds debug messages to be able to spot more easily
>if this case happens again in the future. Sorry for the spam if you
>activate the debug level though.
>
>Signed-off-by: Martin Peres <martin.peres@labri.fr>
>---
> drivers/gpu/drm/nouveau/core/subdev/therm/base.c |  7 +++++++
> drivers/gpu/drm/nouveau/core/subdev/therm/fan.c  | 19 ++++++++++++++++++-
> drivers/gpu/drm/nouveau/core/subdev/therm/priv.h |  2 ++
> drivers/gpu/drm/nouveau/core/subdev/therm/temp.c |  2 ++
> 4 files changed, 29 insertions(+), 1 deletion(-)
>
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
>index 2ada3d7..4b2f012 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
>@@ -95,12 +95,14 @@ 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;
> 
> 	switch (mode) {
> 	case NOUVEAU_THERM_CTRL_MANUAL:
>+		ptimer->alarm_cancel(ptimer, &priv->alarm);
> 		duty = nouveau_therm_fan_get(therm);
> 		if (duty < 0)
> 			duty = 100;
>@@ -113,6 +115,7 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode)
> 		break;
> 	case NOUVEAU_THERM_CTRL_NONE:
> 	default:
>+		ptimer->alarm_cancel(ptimer, &priv->alarm);
> 		goto done;
> 	}
> 
>@@ -122,6 +125,8 @@ 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);
> }
> 
>@@ -275,6 +280,7 @@ _nouveau_therm_init(struct nouveau_object *object)
> 		nouveau_therm_fan_mode(therm, priv->suspend);
> 	}
> 	priv->sensor.program_alarms(therm);
>+	nouveau_therm_fan_init(therm);
> 	return 0;
> }
> 
>@@ -284,6 +290,7 @@ _nouveau_therm_fini(struct nouveau_object *object, bool suspend)
> 	struct nouveau_therm *therm = (void *)object;
> 	struct nouveau_therm_priv *priv = (void *)therm;
> 
>+	nouveau_therm_fan_fini(therm, suspend);
> 	if (suspend) {
> 		priv->suspend = priv->mode;
> 		priv->mode = NOUVEAU_THERM_CTRL_NONE;
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
>index 6d411e1..39f47b9 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
>@@ -204,6 +204,23 @@ nouveau_therm_fan_safety_checks(struct nouveau_therm *therm)
> }
> 
> int
>+nouveau_therm_fan_init(struct nouveau_therm *therm)
>+{
>+	return 0;
>+}
>+
>+int
>+nouveau_therm_fan_fini(struct nouveau_therm *therm, bool suspend)
>+{
>+	struct nouveau_therm_priv *priv = (void *)therm;
>+	struct nouveau_timer *ptimer = nouveau_timer(therm);
>+
>+	if (suspend)
>+		ptimer->alarm_cancel(ptimer, &priv->fan->alarm);
>+	return 0;
>+}
>+
>+int
> nouveau_therm_fan_ctor(struct nouveau_therm *therm)
> {
> 	struct nouveau_therm_priv *priv = (void *)therm;
>@@ -233,7 +250,7 @@ nouveau_therm_fan_ctor(struct nouveau_therm *therm)
> 	}
> 
> 	nv_info(therm, "FAN control: %s\n", priv->fan->type);
>-	
>+
> 	/* read the current speed, it is useful when resuming */
> 	priv->fan->percent = nouveau_therm_fan_get(therm);
> 
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h b/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h
>index 15ca64e..4e2378c 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h
>+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h
>@@ -113,6 +113,8 @@ void nouveau_therm_ic_ctor(struct nouveau_therm *therm);
> int nouveau_therm_sensor_ctor(struct nouveau_therm *therm);
> 
> int nouveau_therm_fan_ctor(struct nouveau_therm *therm);
>+int nouveau_therm_fan_init(struct nouveau_therm *therm);
>+int nouveau_therm_fan_fini(struct nouveau_therm *therm, bool suspend);
> int nouveau_therm_fan_get(struct nouveau_therm *therm);
> int nouveau_therm_fan_set(struct nouveau_therm *therm, bool now, int percent);
> int nouveau_therm_fan_user_get(struct nouveau_therm *therm);
>diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
>index dde746c..e9ea462 100644
>--- a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
>+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
>@@ -180,6 +180,8 @@ 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);
> 
>-- 
>1.8.3.4
>

Actions: View | Splinter Review

Attachments on bug 66177: 81430 | 81431 | 83879 | 83880 | 83881 | 83882 | 83883

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.