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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pcir.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pcir.c
index df59787..67cb3ae 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pcir.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pcir.c
@@ -27,19 +27,20 @@
 u32
 nvbios_pcirTe(struct nvkm_bios *bios, u32 base, u8 *ver, u16 *hdr)
 {
-       u32 data = nv_ro16(bios, base + 0x18);
+       u32 data = nvbios_rd16(bios, base + 0x18);
        if (data) {
                data += base;
-               switch (nv_ro32(bios, data + 0x00)) {
+               switch (nvbios_rd32(bios, data + 0x00)) {
                case 0x52494350: /* PCIR */
                case 0x53494752: /* RGIS */
                case 0x5344504e: /* NPDS */
-                       *hdr = nv_ro16(bios, data + 0x0a);
-                       *ver = nv_ro08(bios, data + 0x0c);
+                       *hdr = nvbios_rd16(bios, data + 0x0a);
+                       *ver = nvbios_rd08(bios, data + 0x0c);
                        break;
                default:
-                       nv_debug(bios, "%08x: PCIR signature (%08x) unknown\n",
-                                data, nv_ro32(bios, data + 0x00));
+                       nvkm_debug(&bios->subdev,
+                                  "%08x: PCIR signature (%08x) unknown\n",
+                                  data, nvbios_rd32(bios, data + 0x00));
                        data = 0;
                        break;
                }
@@ -54,15 +55,15 @@ nvbios_pcirTp(struct nvkm_bios *bios, u32 base, u8 *ver, u16 *hdr,
        u32 data = nvbios_pcirTe(bios, base, ver, hdr);
        memset(info, 0x00, sizeof(*info));
        if (data) {
-               info->vendor_id = nv_ro16(bios, data + 0x04);
-               info->device_id = nv_ro16(bios, data + 0x06);
-               info->class_code[0] = nv_ro08(bios, data + 0x0d);
-               info->class_code[1] = nv_ro08(bios, data + 0x0e);
-               info->class_code[2] = nv_ro08(bios, data + 0x0f);
-               info->image_size = nv_ro16(bios, data + 0x10) * 512;
-               info->image_rev = nv_ro16(bios, data + 0x12);
-               info->image_type = nv_ro08(bios, data + 0x14);
-               info->last = nv_ro08(bios, data + 0x15) & 0x80;
+               info->vendor_id = nvbios_rd16(bios, data + 0x04);
+               info->device_id = nvbios_rd16(bios, data + 0x06);
+               info->class_code[0] = nvbios_rd08(bios, data + 0x0d);
+               info->class_code[1] = nvbios_rd08(bios, data + 0x0e);
+               info->class_code[2] = nvbios_rd08(bios, data + 0x0f);
+               info->image_size = nvbios_rd16(bios, data + 0x10) * 512;
+               info->image_rev = nvbios_rd16(bios, data + 0x12);
+               info->image_type = nvbios_rd08(bios, data + 0x14);
+               info->last = nvbios_rd08(bios, data + 0x15) & 0x80;
        }
        return data;
 }