diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2016-11-18 11:31:27 +1000 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2016-11-28 15:38:24 +1000 |
commit | 5d90b6dfc6e16a088ea4af587918f19b740e939a (patch) | |
tree | f5be67f33af56d6ad30fa89538124a8d9c3fadbf | |
parent | f2a191dd4b92a7ebc2af796d2f100a6f867b87cf (diff) | |
download | nouveau-5d90b6dfc6e16a088ea4af587918f19b740e939a.tar.gz |
bios/iccsense: pointers are 32-bit
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drm/nouveau/nvkm/subdev/bios/iccsense.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drm/nouveau/nvkm/subdev/bios/iccsense.c b/drm/nouveau/nvkm/subdev/bios/iccsense.c index aafd5e17b..3953d1184 100644 --- a/drm/nouveau/nvkm/subdev/bios/iccsense.c +++ b/drm/nouveau/nvkm/subdev/bios/iccsense.c @@ -26,18 +26,18 @@ #include <subdev/bios/extdev.h> #include <subdev/bios/iccsense.h> -static u16 +static u32 nvbios_iccsense_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len) { struct bit_entry bit_P; - u16 iccsense; + u32 iccsense; if (bit_entry(bios, 'P', &bit_P) || bit_P.version != 2 || bit_P.length < 0x2c) return 0; - iccsense = nvbios_rd16(bios, bit_P.offset + 0x28); + iccsense = nvbios_rd32(bios, bit_P.offset + 0x28); if (!iccsense) return 0; @@ -61,7 +61,7 @@ nvbios_iccsense_parse(struct nvkm_bios *bios, struct nvbios_iccsense *iccsense) { struct nvkm_subdev *subdev = &bios->subdev; u8 ver, hdr, cnt, len, i; - u16 table, entry; + u32 table, entry; table = nvbios_iccsense_table(bios, &ver, &hdr, &cnt, &len); if (!table || !cnt) |