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

Commit e3a19388 authored by Darrick J. Wong's avatar Darrick J. Wong Committed by Linus Torvalds
Browse files

matroxfb: support G200eV chip 



Support the Matrox G200eV chip, based on timings that I found in the X.org
matrox driver.

Signed-off-by: default avatarDarrick J. Wong <djwong@us.ibm.com>
Acked-by: default avatarKrzysztof Helt <krzysztof.h1@wp.pl>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0b178883

drivers/video/matrox/matroxfb_base.c

+9 −0
Original line number Diff line number Diff line
@@ -1453,6 +1453,13 @@ static struct board { 
		MGA_G100,

		&vbG100,

		"MGA-G100 (AGP)"},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200EV_PCI,	0xFF,

		0,			0,

		DEVF_G200,

		230000,

		MGA_G200,

		&vbG200,

		"MGA-G200eV (PCI)"},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200_PCI,	0xFF,

		0,			0,

		DEVF_G200,
@@ -2118,6 +2125,8 @@ static struct pci_device_id matroxfb_devices[] = { 
		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G100_AGP,

		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200EV_PCI,

		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200_PCI,

		PCI_ANY_ID,	PCI_ANY_ID,	0, 0, 0},

	{PCI_VENDOR_ID_MATROX,	PCI_DEVICE_ID_MATROX_G200_AGP,

include/linux/pci_ids.h

+1 −0
Original line number Diff line number Diff line
@@ -587,6 +587,7 @@ 
#define PCI_DEVICE_ID_MATROX_G200_PCI	0x0520

#define PCI_DEVICE_ID_MATROX_G200_AGP	0x0521

#define	PCI_DEVICE_ID_MATROX_G400	0x0525

#define	PCI_DEVICE_ID_MATROX_G200EV_PCI	0x0530

#define PCI_DEVICE_ID_MATROX_G550	0x2527

#define PCI_DEVICE_ID_MATROX_VIA	0x4536