From aa2143998a563e63f4eed3a8e33f089c47588177 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 28 Jul 2011 11:01:21 +1000 Subject: [PATCH] --- yaml --- r: 282561 b: refs/heads/master c: 771e1035b9bfdb0c3f0e34bd281d73b721a10adb h: refs/heads/master i: 282559: 6f9c30233f4ad589081c1607edd0823c2a7d5b97 v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_pm.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3b8a34c85f12..e5e421635129 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 04de6a046188d86ff60b1ede974dbf580287fc98 +refs/heads/master: 771e1035b9bfdb0c3f0e34bd281d73b721a10adb diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c index a539fd257921..607e4965f4ff 100644 --- a/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/trunk/drivers/gpu/drm/nouveau/nouveau_pm.c @@ -64,6 +64,12 @@ nouveau_pm_perflvl_set(struct drm_device *dev, struct nouveau_pm_level *perflvl) if (perflvl == pm->cur) return 0; + if (pm->fanspeed_set && perflvl->fanspeed) { + ret = pm->fanspeed_set(dev, perflvl->fanspeed); + if (ret) + NV_ERROR(dev, "set fanspeed failed: %d\n", ret); + } + if (pm->voltage.supported && pm->voltage_set && perflvl->volt_min) { ret = pm->voltage_set(dev, perflvl->volt_min); if (ret) { @@ -161,6 +167,9 @@ nouveau_pm_perflvl_get(struct drm_device *dev, struct nouveau_pm_level *perflvl) } } + if (pm->fanspeed_get) + perflvl->fanspeed = pm->fanspeed_get(dev); + return 0; }