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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/ramcfg.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/ramcfg.c
index a17b221..d5222af 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/ramcfg.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/ramcfg.c
@@ -29,7 +29,7 @@
 static u8
 nvbios_ramcfg_strap(struct nvkm_subdev *subdev)
 {
-       return (nv_rd32(subdev, 0x101000) & 0x0000003c) >> 2;
+       return (nvkm_rd32(subdev->device, 0x101000) & 0x0000003c) >> 2;
 }
 
 u8
@@ -39,9 +39,9 @@ nvbios_ramcfg_count(struct nvkm_bios *bios)
 
        if (!bit_entry(bios, 'M', &bit_M)) {
                if (bit_M.version == 1 && bit_M.length >= 5)
-                       return nv_ro08(bios, bit_M.offset + 2);
+                       return nvbios_rd08(bios, bit_M.offset + 2);
                if (bit_M.version == 2 && bit_M.length >= 3)
-                       return nv_ro08(bios, bit_M.offset + 0);
+                       return nvbios_rd08(bios, bit_M.offset + 0);
        }
 
        return 0x00;
@@ -50,7 +50,7 @@ nvbios_ramcfg_count(struct nvkm_bios *bios)
 u8
 nvbios_ramcfg_index(struct nvkm_subdev *subdev)
 {
-       struct nvkm_bios *bios = nvkm_bios(subdev);
+       struct nvkm_bios *bios = subdev->device->bios;
        u8 strap = nvbios_ramcfg_strap(subdev);
        u32 xlat = 0x00000000;
        struct bit_entry bit_M;
@@ -59,7 +59,7 @@ nvbios_ramcfg_index(struct nvkm_subdev *subdev)
 
        if (!bit_entry(bios, 'M', &bit_M)) {
                if (bit_M.version == 1 && bit_M.length >= 5)
-                       xlat = nv_ro16(bios, bit_M.offset + 3);
+                       xlat = nvbios_rd16(bios, bit_M.offset + 3);
                if (bit_M.version == 2 && bit_M.length >= 3) {
                        /*XXX: is M ever shorter than this?
                         *     if not - what is xlat used for now?
@@ -68,11 +68,11 @@ nvbios_ramcfg_index(struct nvkm_subdev *subdev)
                        if (bit_M.length >= 7 &&
                            nvbios_M0203Em(bios, strap, &ver, &hdr, &M0203E))
                                return M0203E.group;
-                       xlat = nv_ro16(bios, bit_M.offset + 1);
+                       xlat = nvbios_rd16(bios, bit_M.offset + 1);
                }
        }
 
        if (xlat)
-               strap = nv_ro08(bios, xlat + strap);
+               strap = nvbios_rd08(bios, xlat + strap);
        return strap;
 }