Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
drivers
/
gpu
/
drm
/
nouveau
/
nvkm
/
subdev
/
bios
/
npde.c
diff --git
a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/npde.c
b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/npde.c
index
fd7dd71
..
955df29
100644
(file)
--- a/
kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/npde.c
+++ b/
kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/npde.c
@@
-32,12
+32,13
@@
nvbios_npdeTe(struct nvkm_bios *bios, u32 base)
u8 ver; u16 hdr;
u32 data = nvbios_pcirTp(bios, base, &ver, &hdr, &pcir);
if (data = (data + hdr + 0x0f) & ~0x0f, data) {
u8 ver; u16 hdr;
u32 data = nvbios_pcirTp(bios, base, &ver, &hdr, &pcir);
if (data = (data + hdr + 0x0f) & ~0x0f, data) {
- switch (nv
_ro
32(bios, data + 0x00)) {
+ switch (nv
bios_rd
32(bios, data + 0x00)) {
case 0x4544504e: /* NPDE */
break;
default:
case 0x4544504e: /* NPDE */
break;
default:
- nv_debug(bios, "%08x: NPDE signature (%08x) unknown\n",
- data, nv_ro32(bios, data + 0x00));
+ nvkm_debug(&bios->subdev,
+ "%08x: NPDE signature (%08x) unknown\n",
+ data, nvbios_rd32(bios, data + 0x00));
data = 0;
break;
}
data = 0;
break;
}
@@
-51,8
+52,8
@@
nvbios_npdeTp(struct nvkm_bios *bios, u32 base, struct nvbios_npdeT *info)
u32 data = nvbios_npdeTe(bios, base);
memset(info, 0x00, sizeof(*info));
if (data) {
u32 data = nvbios_npdeTe(bios, base);
memset(info, 0x00, sizeof(*info));
if (data) {
- info->image_size = nv
_ro
16(bios, data + 0x08) * 512;
- info->last = nv
_ro
08(bios, data + 0x0a) & 0x80;
+ info->image_size = nv
bios_rd
16(bios, data + 0x08) * 512;
+ info->last = nv
bios_rd
08(bios, data + 0x0a) & 0x80;
}
return data;
}
}
return data;
}