From 771e1035b9bfdb0c3f0e34bd281d73b721a10adb Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Thu, 28 Jul 2011 11:01:21 +1000 Subject: [PATCH] drm/nouveau/pm: hook up fanspeed get/set if they're present Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/nouveau_pm.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.c b/drivers/gpu/drm/nouveau/nouveau_pm.c index a539fd257921..607e4965f4ff 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.c +++ b/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; } -- 2.11.0