drm/nouveau/bios: remove object accessor functions

[deliverable/linux.git] / drivers / gpu / drm / nouveau / nvkm / subdev / devinit / nv05.c

diff --git a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
index fc3b0f4a54e25b7b053c07980309f3eab37e3de1..54de25eea98a16fb0acf74c162fe58809b9c79c7 100644 (file)
--- a/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
+++ b/drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv05.c
@@ -62,8 +62,8 @@ nv05_devinit_meminit(struct nvkm_devinit *init)
 
        strap = (nvkm_rd32(device, 0x101000) & 0x0000003c) >> 2;
        if ((data = bmp_mem_init_table(bios))) {
-               ramcfg[0] = nv_ro08(bios, data + 2 * strap + 0);
-               ramcfg[1] = nv_ro08(bios, data + 2 * strap + 1);
+               ramcfg[0] = nvbios_rd08(bios, data + 2 * strap + 0);
+               ramcfg[1] = nvbios_rd08(bios, data + 2 * strap + 1);
        } else {
                ramcfg[0] = default_config_tab[strap][0];
                ramcfg[1] = default_config_tab[strap][1];
@@ -80,7 +80,7 @@ nv05_devinit_meminit(struct nvkm_devinit *init)
        /* If present load the hardcoded scrambling table */
        if (data) {
                for (i = 0, data += 0x10; i < 8; i++, data += 4) {
-                       u32 scramble = nv_ro32(bios, data);
+                       u32 scramble = nvbios_rd32(bios, data);
                        nvkm_wr32(device, NV04_PFB_SCRAMBLE(i), scramble);
                }
        }