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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c
index 20c5ce0..c268e5a 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/pmu.c
@@ -49,31 +49,18 @@ nvbios_pmuTe(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
 
        if (!bit_entry(bios, 'p', &bit_p)) {
                if (bit_p.version == 2 && bit_p.length >= 4)
-                       data = nv_ro32(bios, bit_p.offset + 0x00);
+                       data = nvbios_rd32(bios, bit_p.offset + 0x00);
                if ((data = weirdo_pointer(bios, data))) {
-                       *ver = nv_ro08(bios, data + 0x00); /* maybe? */
-                       *hdr = nv_ro08(bios, data + 0x01);
-                       *len = nv_ro08(bios, data + 0x02);
-                       *cnt = nv_ro08(bios, data + 0x03);
+                       *ver = nvbios_rd08(bios, data + 0x00); /* maybe? */
+                       *hdr = nvbios_rd08(bios, data + 0x01);
+                       *len = nvbios_rd08(bios, data + 0x02);
+                       *cnt = nvbios_rd08(bios, data + 0x03);
                }
        }
 
        return data;
 }
 
-u32
-nvbios_pmuTp(struct nvkm_bios *bios, u8 *ver, u8 *hdr, u8 *cnt, u8 *len,
-            struct nvbios_pmuT *info)
-{
-       u32 data = nvbios_pmuTe(bios, ver, hdr, cnt, len);
-       memset(info, 0x00, sizeof(*info));
-       switch (!!data * *ver) {
-       default:
-               break;
-       }
-       return data;
-}
-
 u32
 nvbios_pmuEe(struct nvkm_bios *bios, int idx, u8 *ver, u8 *hdr)
 {
@@ -95,8 +82,8 @@ nvbios_pmuEp(struct nvkm_bios *bios, int idx, u8 *ver, u8 *hdr,
        memset(info, 0x00, sizeof(*info));
        switch (!!data * *ver) {
        default:
-               info->type = nv_ro08(bios, data + 0x00);
-               info->data = nv_ro32(bios, data + 0x02);
+               info->type = nvbios_rd08(bios, data + 0x00);
+               info->data = nvbios_rd32(bios, data + 0x02);
                break;
        }
        return data;
@@ -112,21 +99,21 @@ nvbios_pmuRm(struct nvkm_bios *bios, u8 type, struct nvbios_pmuR *info)
        while ((data = nvbios_pmuEp(bios, idx++, &ver, &hdr, &pmuE))) {
                if ( pmuE.type == type &&
                    (data = weirdo_pointer(bios, pmuE.data))) {
-                       info->init_addr_pmu = nv_ro32(bios, data + 0x08);
-                       info->args_addr_pmu = nv_ro32(bios, data + 0x0c);
+                       info->init_addr_pmu = nvbios_rd32(bios, data + 0x08);
+                       info->args_addr_pmu = nvbios_rd32(bios, data + 0x0c);
                        info->boot_addr     = data + 0x30;
-                       info->boot_addr_pmu = nv_ro32(bios, data + 0x10) +
-                                             nv_ro32(bios, data + 0x18);
-                       info->boot_size     = nv_ro32(bios, data + 0x1c) -
-                                             nv_ro32(bios, data + 0x18);
+                       info->boot_addr_pmu = nvbios_rd32(bios, data + 0x10) +
+                                             nvbios_rd32(bios, data + 0x18);
+                       info->boot_size     = nvbios_rd32(bios, data + 0x1c) -
+                                             nvbios_rd32(bios, data + 0x18);
                        info->code_addr     = info->boot_addr + info->boot_size;
                        info->code_addr_pmu = info->boot_addr_pmu +
                                              info->boot_size;
-                       info->code_size     = nv_ro32(bios, data + 0x20);
+                       info->code_size     = nvbios_rd32(bios, data + 0x20);
                        info->data_addr     = data + 0x30 +
-                                             nv_ro32(bios, data + 0x24);
-                       info->data_addr_pmu = nv_ro32(bios, data + 0x28);
-                       info->data_size     = nv_ro32(bios, data + 0x2c);
+                                             nvbios_rd32(bios, data + 0x24);
+                       info->data_addr_pmu = nvbios_rd32(bios, data + 0x28);
+                       info->data_size     = nvbios_rd32(bios, data + 0x2c);
                        return true;
                }
        }