From a1a86aabd0436a409b092ac7db24c702fd7d64b0 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Mon, 22 Sep 2014 11:28:21 +1000 Subject: [PATCH] drm/nouveau/bios: recognise nv-specific rom/pcir signatures Signed-off-by: Ben Skeggs --- drivers/gpu/drm/nouveau/core/subdev/bios/image.c | 1 + drivers/gpu/drm/nouveau/core/subdev/bios/pcir.c | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/gpu/drm/nouveau/core/subdev/bios/image.c b/drivers/gpu/drm/nouveau/core/subdev/bios/image.c index df85cc6d0fc7..9fa6d7043287 100644 --- 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 a58ed44e1643..7ec2a2ac7e89 100644 --- 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; -- 2.39.5