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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0205.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0205.c
index e1a8ad5..293a6af 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0205.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/M0205.c
@@ -34,16 +34,16 @@ nvbios_M0205Te(struct nvkm_bios *bios,
 
        if (!bit_entry(bios, 'M', &bit_M)) {
                if (bit_M.version == 2 && bit_M.length > 0x08)
-                       data = nv_ro32(bios, bit_M.offset + 0x05);
+                       data = nvbios_rd32(bios, bit_M.offset + 0x05);
                if (data) {
-                       *ver = nv_ro08(bios, data + 0x00);
+                       *ver = nvbios_rd08(bios, data + 0x00);
                        switch (*ver) {
                        case 0x10:
-                               *hdr = nv_ro08(bios, data + 0x01);
-                               *len = nv_ro08(bios, data + 0x02);
-                               *ssz = nv_ro08(bios, data + 0x03);
-                               *snr = nv_ro08(bios, data + 0x04);
-                               *cnt = nv_ro08(bios, data + 0x05);
+                               *hdr = nvbios_rd08(bios, data + 0x01);
+                               *len = nvbios_rd08(bios, data + 0x02);
+                               *ssz = nvbios_rd08(bios, data + 0x03);
+                               *snr = nvbios_rd08(bios, data + 0x04);
+                               *cnt = nvbios_rd08(bios, data + 0x05);
                                return data;
                        default:
                                break;
@@ -63,7 +63,7 @@ nvbios_M0205Tp(struct nvkm_bios *bios,
        memset(info, 0x00, sizeof(*info));
        switch (!!data * *ver) {
        case 0x10:
-               info->freq = nv_ro16(bios, data + 0x06);
+               info->freq = nvbios_rd16(bios, data + 0x06);
                break;
        default:
                break;
@@ -96,7 +96,7 @@ nvbios_M0205Ep(struct nvkm_bios *bios, int idx,
        memset(info, 0x00, sizeof(*info));
        switch (!!data * *ver) {
        case 0x10:
-               info->type = nv_ro08(bios, data + 0x00) & 0x0f;
+               info->type = nvbios_rd08(bios, data + 0x00) & 0x0f;
                return data;
        default:
                break;
@@ -126,7 +126,7 @@ nvbios_M0205Sp(struct nvkm_bios *bios, int ent, int idx, u8 *ver, u8 *hdr,
        memset(info, 0x00, sizeof(*info));
        switch (!!data * *ver) {
        case 0x10:
-               info->data = nv_ro08(bios, data + 0x00);
+               info->data = nvbios_rd08(bios, data + 0x00);
                return data;
        default:
                break;