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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c
index e95b69f..2f13db7 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/vmap.c
@@ -33,15 +33,15 @@ nvbios_vmap_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
 
        if (!bit_entry(bios, 'P', &bit_P)) {
                if (bit_P.version == 2) {
-                       vmap = nv_ro16(bios, bit_P.offset + 0x20);
+                       vmap = nvbios_rd16(bios, bit_P.offset + 0x20);
                        if (vmap) {
-                               *ver = nv_ro08(bios, vmap + 0);
+                               *ver = nvbios_rd08(bios, vmap + 0);
                                switch (*ver) {
                                case 0x10:
                                case 0x20:
-                                       *hdr = nv_ro08(bios, vmap + 1);
-                                       *cnt = nv_ro08(bios, vmap + 3);
-                                       *len = nv_ro08(bios, vmap + 2);
+                                       *hdr = nvbios_rd08(bios, vmap + 1);
+                                       *cnt = nvbios_rd08(bios, vmap + 3);
+                                       *len = nvbios_rd08(bios, vmap + 2);
                                        return vmap;
                                default:
                                        break;
@@ -88,23 +88,23 @@ nvbios_vmap_entry_parse(struct nvkm_bios *bios, int idx, u8 *ver, u8 *len,
        switch (!!vmap * *ver) {
        case 0x10:
                info->link   = 0xff;
-               info->min    = nv_ro32(bios, vmap + 0x00);
-               info->max    = nv_ro32(bios, vmap + 0x04);
-               info->arg[0] = nv_ro32(bios, vmap + 0x08);
-               info->arg[1] = nv_ro32(bios, vmap + 0x0c);
-               info->arg[2] = nv_ro32(bios, vmap + 0x10);
+               info->min    = nvbios_rd32(bios, vmap + 0x00);
+               info->max    = nvbios_rd32(bios, vmap + 0x04);
+               info->arg[0] = nvbios_rd32(bios, vmap + 0x08);
+               info->arg[1] = nvbios_rd32(bios, vmap + 0x0c);
+               info->arg[2] = nvbios_rd32(bios, vmap + 0x10);
                break;
        case 0x20:
-               info->unk0   = nv_ro08(bios, vmap + 0x00);
-               info->link   = nv_ro08(bios, vmap + 0x01);
-               info->min    = nv_ro32(bios, vmap + 0x02);
-               info->max    = nv_ro32(bios, vmap + 0x06);
-               info->arg[0] = nv_ro32(bios, vmap + 0x0a);
-               info->arg[1] = nv_ro32(bios, vmap + 0x0e);
-               info->arg[2] = nv_ro32(bios, vmap + 0x12);
-               info->arg[3] = nv_ro32(bios, vmap + 0x16);
-               info->arg[4] = nv_ro32(bios, vmap + 0x1a);
-               info->arg[5] = nv_ro32(bios, vmap + 0x1e);
+               info->unk0   = nvbios_rd08(bios, vmap + 0x00);
+               info->link   = nvbios_rd08(bios, vmap + 0x01);
+               info->min    = nvbios_rd32(bios, vmap + 0x02);
+               info->max    = nvbios_rd32(bios, vmap + 0x06);
+               info->arg[0] = nvbios_rd32(bios, vmap + 0x0a);
+               info->arg[1] = nvbios_rd32(bios, vmap + 0x0e);
+               info->arg[2] = nvbios_rd32(bios, vmap + 0x12);
+               info->arg[3] = nvbios_rd32(bios, vmap + 0x16);
+               info->arg[4] = nvbios_rd32(bios, vmap + 0x1a);
+               info->arg[5] = nvbios_rd32(bios, vmap + 0x1e);
                break;
        }
        return vmap;