Home Explore Help
Sign In
GfA
/
linux_kernel
5
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'linux-4.4' of git://github.com/skeggsb/linux into drm-fixes

single nouveau fix.

* 'linux-4.4' of git://github.com/skeggsb/linux:
  drm/nouveau/bios/fan: hardcode the fan mode to linear
Dave Airlie 9 years ago
parent
8e73a108ac a814a29d7b
commit
6545f31897
1 changed files with 1 additions and 0 deletions
Split View Show Diff Stats
  1. 1 0
      drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c

+ 1 - 0
drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c
View File 

@@ -83,6 +83,7 @@ nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan)
 
 			fan->type = NVBIOS_THERM_FAN_UNK;
 
 		}
 
 
+		fan->fan_mode = NVBIOS_THERM_FAN_LINEAR;
 
 		fan->min_duty = nvbios_rd08(bios, data + 0x02);
 
 		fan->max_duty = nvbios_rd08(bios, data + 0x03);