diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2016-07-09 10:41:01 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2016-07-09 10:41:01 +1000 |
| commit | e6bcf54c783f2f88cf725ac5e44711374f0ca03e (patch) | |
| tree | c91decb130372dee9b92b2777654692f8bb1f431 | |
| parent | ecd65b7d3f1de6d696512b739d6ae82a98266eff (diff) | |
| download | nouveau-e6bcf54c783f2f88cf725ac5e44711374f0ca03e.tar.gz | |
bios/rammap: 32-bit bios pointers
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
| -rw-r--r-- | drm/nouveau/nvkm/subdev/bios/rammap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drm/nouveau/nvkm/subdev/bios/rammap.c b/drm/nouveau/nvkm/subdev/bios/rammap.c index d0ae74547..b57c370c7 100644 --- a/drm/nouveau/nvkm/subdev/bios/rammap.c +++ b/drm/nouveau/nvkm/subdev/bios/rammap.c @@ -30,11 +30,11 @@ nvbios_rammapTe(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz) { struct bit_entry bit_P; - u16 rammap = 0x0000; + u32 rammap = 0x0000; if (!bit_entry(bios, 'P', &bit_P)) { if (bit_P.version == 2) - rammap = nvbios_rd16(bios, bit_P.offset + 4); + rammap = nvbios_rd32(bios, bit_P.offset + 4); if (rammap) { *ver = nvbios_rd08(bios, rammap + 0); @@ -61,7 +61,7 @@ nvbios_rammapEe(struct nvkm_bios *bios, int idx, u8 *ver, u8 *hdr, u8 *cnt, u8 *len) { u8 snr, ssz; - u16 rammap = nvbios_rammapTe(bios, ver, hdr, cnt, len, &snr, &ssz); + u32 rammap = nvbios_rammapTe(bios, ver, hdr, cnt, len, &snr, &ssz); if (rammap && idx < *cnt) { rammap = rammap + *hdr + (idx * (*len + (snr * ssz))); *hdr = *len; |