These changes are the raw update to linux-4.4.6-rt14. Kernel sources

[kvmfornfv.git] / kernel / drivers / gpu / drm / nouveau / nvkm / subdev / bios / extdev.c

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c
index a8503a1..c9e6f6f 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/extdev.c
@@ -35,14 +35,14 @@ extdev_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *len, u8 *cnt)
        if (!dcb || (dcb_ver != 0x30 && dcb_ver != 0x40))
                return 0x0000;
 
-       extdev = nv_ro16(bios, dcb + 18);
+       extdev = nvbios_rd16(bios, dcb + 18);
        if (!extdev)
                return 0x0000;
 
-       *ver = nv_ro08(bios, extdev + 0);
-       *hdr = nv_ro08(bios, extdev + 1);
-       *cnt = nv_ro08(bios, extdev + 2);
-       *len = nv_ro08(bios, extdev + 3);
+       *ver = nvbios_rd08(bios, extdev + 0);
+       *hdr = nvbios_rd08(bios, extdev + 1);
+       *cnt = nvbios_rd08(bios, extdev + 2);
+       *len = nvbios_rd08(bios, extdev + 3);
        return extdev + *hdr;
 }
 
@@ -60,9 +60,9 @@ static void
 extdev_parse_entry(struct nvkm_bios *bios, u16 offset,
                   struct nvbios_extdev_func *entry)
 {
-       entry->type = nv_ro08(bios, offset + 0);
-       entry->addr = nv_ro08(bios, offset + 1);
-       entry->bus = (nv_ro08(bios, offset + 2) >> 4) & 1;
+       entry->type = nvbios_rd08(bios, offset + 0);
+       entry->addr = nvbios_rd08(bios, offset + 1);
+       entry->bus = (nvbios_rd08(bios, offset + 2) >> 4) & 1;
 }
 
 int