aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2016-11-17 20:31:27 -0500
committerBen Skeggs <bskeggs@redhat.com>2016-11-28 00:39:34 -0500
commit5764ff609de3a063c6bebe80f3777ae2ff19467a (patch)
treebee3a9b72142270f46cc6b50c2b9ba008af45da2
parent4a8daacf50bd3904ededa753667da321c5998717 (diff)
drm/nouveau/bios/iccsense: pointers are 32-bit
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
index aafd5e17b1c8..3953d11844ea 100644
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/bios/iccsense.c
@@ -26,18 +26,18 @@
26#include <subdev/bios/extdev.h> 26#include <subdev/bios/extdev.h>
27#include <subdev/bios/iccsense.h> 27#include <subdev/bios/iccsense.h>
28 28
29static u16 29static u32
30nvbios_iccsense_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, 30nvbios_iccsense_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt,
31 u8 *len) 31 u8 *len)
32{ 32{
33 struct bit_entry bit_P; 33 struct bit_entry bit_P;
34 u16 iccsense; 34 u32 iccsense;
35 35
36 if (bit_entry(bios, 'P', &bit_P) || bit_P.version != 2 || 36 if (bit_entry(bios, 'P', &bit_P) || bit_P.version != 2 ||
37 bit_P.length < 0x2c) 37 bit_P.length < 0x2c)
38 return 0; 38 return 0;
39 39
40 iccsense = nvbios_rd16(bios, bit_P.offset + 0x28); 40 iccsense = nvbios_rd32(bios, bit_P.offset + 0x28);
41 if (!iccsense) 41 if (!iccsense)
42 return 0; 42 return 0;
43 43
@@ -61,7 +61,7 @@ nvbios_iccsense_parse(struct nvkm_bios *bios, struct nvbios_iccsense *iccsense)
61{ 61{
62 struct nvkm_subdev *subdev = &bios->subdev; 62 struct nvkm_subdev *subdev = &bios->subdev;
63 u8 ver, hdr, cnt, len, i; 63 u8 ver, hdr, cnt, len, i;
64 u16 table, entry; 64 u32 table, entry;
65 65
66 table = nvbios_iccsense_table(bios, &ver, &hdr, &cnt, &len); 66 table = nvbios_iccsense_table(bios, &ver, &hdr, &cnt, &len);
67 if (!table || !cnt) 67 if (!table || !cnt)