[PATCH 4.2.y-ckt 228/305] drm/nouveau/bios/fan: hardcode the fan mode to linear

From: Kamal Mostafa
Date: Fri Jan 15 2016 - 19:29:44 EST

4.2.8-ckt2 -stable review patch. If anyone has any objections, please let me know.


From: Martin Peres <martin.peres@xxxxxxx>

commit a814a29d7bbfdfe56fe1bb9641a185077066eb9f upstream.

This is an oversight that made use of the trip-point-based fan managenent on
cards that never expose those. This led the fan to stay at fan_min.

Fortunately, the emergency code would kick when the temperature would reach

Reported-by: Tom Englund <tomenglund26@xxxxxxxxx>
Tested-by: Tom Englund <tomenglund26@xxxxxxxxx>
Signed-off-by: Martin Peres <martin.peres@xxxxxxx>
Tested-by: Daemon32 <lnf.purple@xxxxxxxxx>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92126
Signed-off-by: Ben Skeggs <bskeggs@xxxxxxxxxx>
Signed-off-by: Kamal Mostafa <kamal@xxxxxxxxxxxxx>
drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c
index 8dba70d..e089752 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c
@@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan)

+ fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
fan->min_duty = nv_ro08(bios, data + 0x02);
fan->max_duty = nv_ro08(bios, data + 0x03);