Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a1a86aab authored by Ben Skeggs's avatar Ben Skeggs
Browse files

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



Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent 7205875d

drivers/gpu/drm/nouveau/core/subdev/bios/image.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -38,6 +38,7 @@ nvbios_imagen(struct nouveau_bios *bios, struct nvbios_image *image) 




	switch ((data = nv_ro16(bios, image->base + 0x00))) {

	switch ((data = nv_ro16(bios, image->base + 0x00))) {

	case 0xaa55:

	case 0xaa55:

	case 0x4e56: /* NV */

		break;

		break;

	default:

	default:

		nv_debug(bios, "%08x: ROM signature (%04x) unknown\n",

		nv_debug(bios, "%08x: ROM signature (%04x) unknown\n",

drivers/gpu/drm/nouveau/core/subdev/bios/pcir.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -33,6 +33,7 @@ nvbios_pcirTe(struct nouveau_bios *bios, u32 base, u8 *ver, u16 *hdr) 
		data += base;

		data += base;

		switch (nv_ro32(bios, data + 0x00)) {

		switch (nv_ro32(bios, data + 0x00)) {

		case 0x52494350: /* PCIR */

		case 0x52494350: /* PCIR */

		case 0x5344504e: /* NPDS */

			*hdr = nv_ro16(bios, data + 0x0a);

			*hdr = nv_ro16(bios, data + 0x0a);

			*ver = nv_ro08(bios, data + 0x0c);

			*ver = nv_ro08(bios, data + 0x0c);

			break;

			break;