Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6545f318 authored by Dave Airlie's avatar Dave Airlie
Browse files

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
parents 8e73a108 a814a29d

drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c

+1 −0
Original line number Diff line number Diff line
@@ -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);