2 files changed, 9 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 3e9d941de553..2ada3d71312f 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
@@ -267,8 +267,13 @@ _nouveau_therm_init(struct nouveau_object *object)
         if (ret)
                 return ret;
 
-        if (priv->suspend >= 0)
+        if (priv->suspend >= 0) {
+                /* restore the pwm value only when on manual or auto mode */
+                if (priv->suspend > 0)
+                        nouveau_therm_fan_set(therm, true, priv->fan->percent);
+
                 nouveau_therm_fan_mode(therm, priv->suspend);
+        }
         priv->sensor.program_alarms(therm);
         return 0;
 }
diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
index c728380d3d62..4d8450fcf0a0 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/fan.c
@@ -234,6 +234,9 @@ 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);
+
         /* attempt to detect a tachometer connection */
         ret = gpio->find(gpio, 0, DCB_GPIO_FAN_SENSE, 0xff, &priv->fan->tach);
         if (ret)