4 files changed, 51 insertions, 1 deletions

diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
index 2ada3d71312f..f1de7a9c572b 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);
 }
 
@@ -274,7 +279,8 @@ _nouveau_therm_init(struct nouveau_object *object)
 
                 nouveau_therm_fan_mode(therm, priv->suspend);
         }
-        priv->sensor.program_alarms(therm);
+        nouveau_therm_sensor_init(therm);
+        nouveau_therm_fan_init(therm);
         return 0;
 }
 
@@ -284,6 +290,8 @@ _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);
+        nouveau_therm_sensor_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 4d8450fcf0a0..39f47b950ad1 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;
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h b/drivers/gpu/drm/nouveau/core/subdev/therm/priv.h
index 15ca64e481f1..dd38529262fb 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);
@@ -122,6 +124,8 @@ int nouveau_therm_fan_sense(struct nouveau_therm *therm);
 
 int nouveau_therm_preinit(struct nouveau_therm *);
 
+int nouveau_therm_sensor_init(struct nouveau_therm *therm);
+int nouveau_therm_sensor_fini(struct nouveau_therm *therm, bool suspend);
 void nouveau_therm_sensor_preinit(struct nouveau_therm *);
 void nouveau_therm_sensor_set_threshold_state(struct nouveau_therm *therm,
                                              enum nouveau_therm_thrs thrs,
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c b/drivers/gpu/drm/nouveau/core/subdev/therm/temp.c
index dde746c78c8a..b80a33011b93 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);
 
@@ -216,6 +218,25 @@ nouveau_therm_program_alarms_polling(struct nouveau_therm *therm)
         alarm_timer_callback(&priv->sensor.therm_poll_alarm);
 }
 
+int
+nouveau_therm_sensor_init(struct nouveau_therm *therm)
+{
+        struct nouveau_therm_priv *priv = (void *)therm;
+        priv->sensor.program_alarms(therm);
+        return 0;
+}
+
+int
+nouveau_therm_sensor_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->sensor.therm_poll_alarm);
+        return 0;
+}
+
 void
 nouveau_therm_sensor_preinit(struct nouveau_therm *therm)
 {