drm/nouveau/bios: recognise nv-specific rom/pcir signatures

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
index df85cc6d0fc7ee36ae2cf066ea31434a197c2b38..9fa6d7043287faf54f166bace32f6f14867dc477 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c
@@ -38,6 +38,7 @@ nvbios_imagen(struct nouveau_bios *bios, struct nvbios_image *image)
 
        switch ((data = nv_ro16(bios, image->base + 0x00))) {
        case 0xaa55:
+       case 0x4e56: /* NV */
                break;
        default:
                nv_debug(bios, "%08x: ROM signature (%04x) unknown\n",

diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/pcir.c b/drivers/gpu/drm/nouveau/core/subdev/bios/pcir.c
index a58ed44e1643eb546f04fb3ae2c0ddcd2d553158..7ec2a2ac7e89893c434b8c45f2b55ff8585ceab3 100644 (file)
--- a/drivers/gpu/drm/nouveau/core/subdev/bios/pcir.c
+++ b/drivers/gpu/drm/nouveau/core/subdev/bios/pcir.c
@@ -33,6 +33,7 @@ nvbios_pcirTe(struct nouveau_bios *bios, u32 base, u8 *ver, u16 *hdr)
                data += base;
                switch (nv_ro32(bios, data + 0x00)) {
                case 0x52494350: /* PCIR */
+               case 0x5344504e: /* NPDS */
                        *hdr = nv_ro16(bios, data + 0x0a);
                        *ver = nv_ro08(bios, data + 0x0c);
                        break;