diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-12-19 04:25:42 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-12-19 04:25:42 +0100 |
| commit | 6545f3189707c9105fcf160c2da2ddd2dacca331 (patch) | |
| tree | 64cd70fdb3f6ec2117c67170dae6c81203e58f66 /drivers/gpu/drm/nouveau/nvkm/subdev | |
| parent | Merge branch 'drm-fixes-4.4' of git://people.freedesktop.org/~agd5f/linux int... (diff) | |
| parent | drm/nouveau/bios/fan: hardcode the fan mode to linear (diff) | |
| download | linux-6545f3189707c9105fcf160c2da2ddd2dacca331.tar.xz linux-6545f3189707c9105fcf160c2da2ddd2dacca331.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c index 43006db6fd58..80fed7e78dcb 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->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); |