drm/nouveau/pm: restore fan speed after suspend

Signed-off-by: Martin Peres <martin.peres@labri.fr>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h
index 760f85c85ccd332f34250c86a01ea25b1a74a82d..378c64c2973ee2003339849ca8a9685e9a060f06 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_drv.h
+++ b/drivers/gpu/drm/nouveau/nouveau_drv.h
@@ -519,6 +519,7 @@ struct nouveau_pm_memtimings {
 };
 
 struct nouveau_pm_fan {
+       u32 percent;
        u32 min_duty;
        u32 max_duty;
        u32 pwm_freq;

diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c
index 1770f1569c9084209986f06cce661d317f31f509..0c79f060f7f1c8442a10ef86fbe7a9523d398e27 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_pm.c
+++ b/drivers/gpu/drm/nouveau/nouveau_pm.c
@@ -89,7 +89,10 @@ nouveau_pwmfan_set(struct drm_device *dev, int percent)
                if (dev_priv->card_type <= NV_40 || (gpio.log[0] & 1))
                        duty = divs - duty;
 
-               return pm->pwm_set(dev, gpio.line, divs, duty);
+               ret = pm->pwm_set(dev, gpio.line, divs, duty);
+               if (!ret)
+                       pm->fan.percent = percent;
+               return ret;
        }
 
        return -ENODEV;
@@ -800,6 +803,9 @@ nouveau_pm_init(struct drm_device *dev)
                }
        }
 
+       /* determine the current fan speed */
+       pm->fan.percent = nouveau_pwmfan_get(dev);
+
        nouveau_sysfs_init(dev);
        nouveau_hwmon_init(dev);
 #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)
@@ -844,4 +850,5 @@ nouveau_pm_resume(struct drm_device *dev)
        perflvl = pm->cur;
        pm->cur = &pm->boot;
        nouveau_pm_perflvl_set(dev, perflvl);
+       nouveau_pwmfan_set(dev, pm->fan.percent);
 }