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

Commit 63921fbf authored by Ville Syrjälä's avatar Ville Syrjälä Committed by Linus Torvalds
Browse files

[PATCH] matroxfb: Add support for Mystique AGP 



Add new entries for Mystique AGP with the PCI ID 0x051e.

I don't actually have such boards but according to google they do exist.
Curiosly X.Org doesn't recognize that PCI ID.  And what's even more
interesting is that Matrox's own Windows drivers don't recognize it either.
After going through about a dozen different versions I did find one older
driver that does list this particular ID.  It is also listed in the pci.ids
file.

I'm not sure if non-220 AGP chips exist.  I left the chip revision check
intact for AGP chips nonetheless.

Signed-off-by: default avatarVille Syrjl <syrjala@sci.fi>
Signed-off-by: default avatarPetr Vandrovec <petr@vandrovec.name>
Cc: "Antonino A. Daplas" <adaplas@pol.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent b1e91fdf

drivers/video/matrox/matroxfb_base.c

+14 −0
Original line number Diff line number Diff line
@@ -1428,6 +1428,20 @@ static struct board { 
		MGA_1164,

		&vbMystique,

		"Mystique 220 (PCI)"},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_MYS_AGP,	0x02,

		0,			0,

		DEVF_VIDEO64BIT | DEVF_CROSS4MB,

		180000,

		MGA_1064,

		&vbMystique,

		"Mystique (AGP)"},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_MYS_AGP,	0xFF,

		0,			0,

		DEVF_VIDEO64BIT | DEVF_SWAPS | DEVF_CROSS4MB,

		220000,

		MGA_1164,

		&vbMystique,

		"Mystique 220 (AGP)"},

#endif

#ifdef CONFIG_FB_MATROX_G

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G100_MM,	0xFF,

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -519,6 +519,7 @@ 
#define PCI_DEVICE_ID_MATROX_MIL	0x0519

#define PCI_DEVICE_ID_MATROX_MYS	0x051A

#define PCI_DEVICE_ID_MATROX_MIL_2	0x051b

#define PCI_DEVICE_ID_MATROX_MYS_AGP	0x051e

#define PCI_DEVICE_ID_MATROX_MIL_2_AGP	0x051f

#define PCI_DEVICE_ID_MATROX_MGA_IMP	0x0d10

#define PCI_DEVICE_ID_MATROX_G100_MM	0x1000