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

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

diff --git a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c
index 1815540..74b14cf 100644 (file)
--- a/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c
+++ b/kernel/drivers/gpu/drm/nouveau/nvkm/subdev/bios/image.c
@@ -29,20 +29,21 @@
 static bool
 nvbios_imagen(struct nvkm_bios *bios, struct nvbios_image *image)
 {
+       struct nvkm_subdev *subdev = &bios->subdev;
        struct nvbios_pcirT pcir;
        struct nvbios_npdeT npde;
        u8  ver;
        u16 hdr;
        u32 data;
 
-       switch ((data = nv_ro16(bios, image->base + 0x00))) {
+       switch ((data = nvbios_rd16(bios, image->base + 0x00))) {
        case 0xaa55:
        case 0xbb77:
        case 0x4e56: /* NV */
                break;
        default:
-               nv_debug(bios, "%08x: ROM signature (%04x) unknown\n",
-                        image->base, data);
+               nvkm_debug(subdev, "%08x: ROM signature (%04x) unknown\n",
+                          image->base, data);
                return false;
        }