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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
index 262c410..a5e9213 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/disp.c
@@ -33,17 +33,17 @@ nvbios_disp_table(struct nvkm_bios *bios,
 
        if (!bit_entry(bios, 'U', &U)) {
                if (U.version == 1) {
-                       u16 data = nv_ro16(bios, U.offset);
+                       u16 data = nvbios_rd16(bios, U.offset);
                        if (data) {
-                               *ver = nv_ro08(bios, data + 0x00);
+                               *ver = nvbios_rd08(bios, data + 0x00);
                                switch (*ver) {
                                case 0x20:
                                case 0x21:
                                case 0x22:
-                                       *hdr = nv_ro08(bios, data + 0x01);
-                                       *len = nv_ro08(bios, data + 0x02);
-                                       *cnt = nv_ro08(bios, data + 0x03);
-                                       *sub = nv_ro08(bios, data + 0x04);
+                                       *hdr = nvbios_rd08(bios, data + 0x01);
+                                       *len = nvbios_rd08(bios, data + 0x02);
+                                       *cnt = nvbios_rd08(bios, data + 0x03);
+                                       *sub = nvbios_rd08(bios, data + 0x04);
                                        return data;
                                default:
                                        break;
@@ -72,7 +72,7 @@ nvbios_disp_parse(struct nvkm_bios *bios, u8 idx, u8 *ver, u8 *len, u8 *sub,
 {
        u16 data = nvbios_disp_entry(bios, idx, ver, len, sub);
        if (data && *len >= 2) {
-               info->data = nv_ro16(bios, data + 0);
+               info->data = nvbios_rd16(bios, data + 0);
                return data;
        }
        return 0x0000;
@@ -85,7 +85,7 @@ nvbios_outp_entry(struct nvkm_bios *bios, u8 idx,
        struct nvbios_disp info;
        u16 data = nvbios_disp_parse(bios, idx, ver, len, hdr, &info);
        if (data) {
-               *cnt = nv_ro08(bios, info.data + 0x05);
+               *cnt = nvbios_rd08(bios, info.data + 0x05);
                *len = 0x06;
                data = info.data;
        }
@@ -98,15 +98,15 @@ nvbios_outp_parse(struct nvkm_bios *bios, u8 idx,
 {
        u16 data = nvbios_outp_entry(bios, idx, ver, hdr, cnt, len);
        if (data && *hdr >= 0x0a) {
-               info->type      = nv_ro16(bios, data + 0x00);
-               info->mask      = nv_ro32(bios, data + 0x02);
+               info->type      = nvbios_rd16(bios, data + 0x00);
+               info->mask      = nvbios_rd32(bios, data + 0x02);
                if (*ver <= 0x20) /* match any link */
                        info->mask |= 0x00c0;
-               info->script[0] = nv_ro16(bios, data + 0x06);
-               info->script[1] = nv_ro16(bios, data + 0x08);
+               info->script[0] = nvbios_rd16(bios, data + 0x06);
+               info->script[1] = nvbios_rd16(bios, data + 0x08);
                info->script[2] = 0x0000;
                if (*hdr >= 0x0c)
-                       info->script[2] = nv_ro16(bios, data + 0x0a);
+                       info->script[2] = nvbios_rd16(bios, data + 0x0a);
                return data;
        }
        return 0x0000;
@@ -141,9 +141,9 @@ nvbios_ocfg_parse(struct nvkm_bios *bios, u16 outp, u8 idx,
 {
        u16 data = nvbios_ocfg_entry(bios, outp, idx, ver, hdr, cnt, len);
        if (data) {
-               info->match     = nv_ro16(bios, data + 0x00);
-               info->clkcmp[0] = nv_ro16(bios, data + 0x02);
-               info->clkcmp[1] = nv_ro16(bios, data + 0x04);
+               info->match     = nvbios_rd16(bios, data + 0x00);
+               info->clkcmp[0] = nvbios_rd16(bios, data + 0x02);
+               info->clkcmp[1] = nvbios_rd16(bios, data + 0x04);
        }
        return data;
 }
@@ -164,8 +164,8 @@ u16
 nvbios_oclk_match(struct nvkm_bios *bios, u16 cmp, u32 khz)
 {
        while (cmp) {
-               if (khz / 10 >= nv_ro16(bios, cmp + 0x00))
-                       return  nv_ro16(bios, cmp + 0x02);
+               if (khz / 10 >= nvbios_rd16(bios, cmp + 0x00))
+                       return  nvbios_rd16(bios, cmp + 0x02);
                cmp += 0x04;
        }
        return 0x0000;