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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c
index c4087df..3ddf093 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/mxm.c
@@ -28,17 +28,18 @@
 u16
 mxm_table(struct nvkm_bios *bios, u8 *ver, u8 *hdr)
 {
+       struct nvkm_subdev *subdev = &bios->subdev;
        struct bit_entry x;
 
        if (bit_entry(bios, 'x', &x)) {
-               nv_debug(bios, "BIT 'x' table not present\n");
+               nvkm_debug(subdev, "BIT 'x' table not present\n");
                return 0x0000;
        }
 
        *ver = x.version;
        *hdr = x.length;
        if (*ver != 1 || *hdr < 3) {
-               nv_warn(bios, "BIT 'x' table %d/%d unknown\n", *ver, *hdr);
+               nvkm_warn(subdev, "BIT 'x' table %d/%d unknown\n", *ver, *hdr);
                return 0x0000;
        }
 
@@ -73,23 +74,24 @@ static u8 g98_sor_map[16] = {
 u8
 mxm_sor_map(struct nvkm_bios *bios, u8 conn)
 {
+       struct nvkm_subdev *subdev = &bios->subdev;
        u8  ver, hdr;
        u16 mxm = mxm_table(bios, &ver, &hdr);
        if (mxm && hdr >= 6) {
-               u16 map = nv_ro16(bios, mxm + 4);
+               u16 map = nvbios_rd16(bios, mxm + 4);
                if (map) {
-                       ver = nv_ro08(bios, map);
+                       ver = nvbios_rd08(bios, map);
                        if (ver == 0x10) {
-                               if (conn < nv_ro08(bios, map + 3)) {
-                                       map += nv_ro08(bios, map + 1);
+                               if (conn < nvbios_rd08(bios, map + 3)) {
+                                       map += nvbios_rd08(bios, map + 1);
                                        map += conn;
-                                       return nv_ro08(bios, map);
+                                       return nvbios_rd08(bios, map);
                                }
 
                                return 0x00;
                        }
 
-                       nv_warn(bios, "unknown sor map v%02x\n", ver);
+                       nvkm_warn(subdev, "unknown sor map v%02x\n", ver);
                }
        }
 
@@ -102,30 +104,31 @@ mxm_sor_map(struct nvkm_bios *bios, u8 conn)
        if (bios->version.chip == 0x98)
                return g98_sor_map[conn];
 
-       nv_warn(bios, "missing sor map\n");
+       nvkm_warn(subdev, "missing sor map\n");
        return 0x00;
 }
 
 u8
 mxm_ddc_map(struct nvkm_bios *bios, u8 port)
 {
+       struct nvkm_subdev *subdev = &bios->subdev;
        u8  ver, hdr;
        u16 mxm = mxm_table(bios, &ver, &hdr);
        if (mxm && hdr >= 8) {
-               u16 map = nv_ro16(bios, mxm + 6);
+               u16 map = nvbios_rd16(bios, mxm + 6);
                if (map) {
-                       ver = nv_ro08(bios, map);
+                       ver = nvbios_rd08(bios, map);
                        if (ver == 0x10) {
-                               if (port < nv_ro08(bios, map + 3)) {
-                                       map += nv_ro08(bios, map + 1);
+                               if (port < nvbios_rd08(bios, map + 3)) {
+                                       map += nvbios_rd08(bios, map + 1);
                                        map += port;
-                                       return nv_ro08(bios, map);
+                                       return nvbios_rd08(bios, map);
                                }
 
                                return 0x00;
                        }
 
-                       nv_warn(bios, "unknown ddc map v%02x\n", ver);
+                       nvkm_warn(subdev, "unknown ddc map v%02x\n", ver);
                }
        }