hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Martin Peres 2011-10-07 01:33:12 +02:00 committed by Ben Skeggs
parent ddb2005516
commit bc6389e4fa
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
drivers/gpu/drm/nouveau/nouveau_drv.h
View File

@ -519,6 +519,7 @@ struct nouveau_pm_memtimings {
}; };
struct nouveau_pm_fan { struct nouveau_pm_fan {
u32 percent;
u32 min_duty; u32 min_duty;
u32 max_duty; u32 max_duty;
u32 pwm_freq; u32 pwm_freq;

9
drivers/gpu/drm/nouveau/nouveau_pm.c
View File

@ -89,7 +89,10 @@ nouveau_pwmfan_set(struct drm_device *dev, int percent)
if (dev_priv->card_type <= NV_40 || (gpio.log[0] & 1)) if (dev_priv->card_type <= NV_40 || (gpio.log[0] & 1))
duty = divs - duty; 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; 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_sysfs_init(dev);
nouveau_hwmon_init(dev); nouveau_hwmon_init(dev);
#if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY) #if defined(CONFIG_ACPI) && defined(CONFIG_POWER_SUPPLY)
@ -844,4 +850,5 @@ nouveau_pm_resume(struct drm_device *dev)
perflvl = pm->cur; perflvl = pm->cur;
pm->cur = &pm->boot; pm->cur = &pm->boot;
nouveau_pm_perflvl_set(dev, perflvl); nouveau_pm_perflvl_set(dev, perflvl);
nouveau_pwmfan_set(dev, pm->fan.percent);
} }