From: Ben Skeggs <bskeggs@redhat.com>
Date: Wed, 13 Nov 2013 05:52:03 +0000 (+1000)
Subject: drm/nv40/therm: fix slowing down fan when pstate undefined
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=09dacc7bb0c2f32427d926844fca7d5fecec005c;p=linux-beck.git

drm/nv40/therm: fix slowing down fan when pstate undefined

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
index 21b2b3021fad..80e584a1bd1c 100644
--- a/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/therm/base.c
@@ -117,7 +117,8 @@ nouveau_therm_update(struct nouveau_therm *therm, int mode)
 		    priv->fan->bios.linear_max_temp) {
 			duty = nouveau_therm_update_linear(therm);
 		} else {
-			duty = priv->cstate;
+			if (priv->cstate)
+				duty = priv->cstate;
 			poll = false;
 		}
 		immd = false;