diff options
author | Dave Airlie <airlied@redhat.com> | 2017-05-02 04:46:01 +1000 |
---|---|---|
committer | Dave Airlie <airlied@redhat.com> | 2017-05-02 04:46:01 +1000 |
commit | 8b03d1ed2c43a2ba5ef3381322ee4515b97381bf (patch) | |
tree | 901e917a8183f84c039011ffec4bbcd06ac5cad0 /drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c | |
parent | 73ba2d5c2bd4ecfec8fe37f20e962889b8a4c972 (diff) | |
parent | 271393ba6e2ac384a14e581d34d5d72c5953e3c6 (diff) | |
download | op-kernel-dev-8b03d1ed2c43a2ba5ef3381322ee4515b97381bf.zip op-kernel-dev-8b03d1ed2c43a2ba5ef3381322ee4515b97381bf.tar.gz |
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next
Some nouveau regression fixes.
* 'linux-4.12' of git://github.com/skeggsb/linux:
drm/nouveau/fb/gf100-: Fix 32 bit wraparound in new ram detection
drm/nouveau/secboot/gm20b: fix the error return code in gm20b_secboot_tegra_read_wpr()
drm/nouveau/kms: Increase max retries in scanout position queries.
drm/nouveau/bios/bitP: check that table is long enough for optional pointers
drm/nouveau/fifo/nv40: no ctxsw for pre-nv44 mpeg engine
Diffstat (limited to 'drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c')
-rw-r--r-- | drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c index 456f9ea..0dfb15a 100644 --- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c +++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/fan.c @@ -32,7 +32,7 @@ nvbios_fan_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len) u32 fan = 0; if (!bit_entry(bios, 'P', &bit_P)) { - if (bit_P.version == 2 && bit_P.length >= 0x5a) + if (bit_P.version == 2 && bit_P.length >= 0x5c) fan = nvbios_rd32(bios, bit_P.offset + 0x58); if (fan) { |