]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/nouveau/bios/iccsense: pointers are 32-bit
authorBen Skeggs <bskeggs@redhat.com>
Fri, 18 Nov 2016 01:31:27 +0000 (11:31 +1000)
committerBen Skeggs <bskeggs@redhat.com>
Mon, 28 Nov 2016 05:39:34 +0000 (15:39 +1000)
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c

index aafd5e17b1c8070c6851dc802946e0bba45945d5..3953d11844ea008ee4137e6e2441c7f12b808e91 100644 (file)
 #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)