diff options
author | Darrick J. Wong <djwong@us.ibm.com> | 2008-10-16 01:03:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-16 14:21:45 -0400 |
commit | e3a1938805d2e81b27d3d348788644f3bad004f2 (patch) | |
tree | 7517d691452e937c57a9692dc1757c9d83fd5cd3 | |
parent | 0b178883b36e6f522e4a7019bf5a147daf521a01 (diff) |
matroxfb: support G200eV chip
Support the Matrox G200eV chip, based on timings that I found in the X.org
matrox driver.
Signed-off-by: Darrick J. Wong <djwong@us.ibm.com>
Acked-by: Krzysztof Helt <krzysztof.h1@wp.pl>
Cc: Petr Vandrovec <vandrove@vc.cvut.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/video/matrox/matroxfb_base.c | 9 | ||||
-rw-r--r-- | include/linux/pci_ids.h | 1 |
2 files changed, 10 insertions, 0 deletions
diff --git a/drivers/video/matrox/matroxfb_base.c b/drivers/video/matrox/matroxfb_base.c index c02136202792..8e7a275df50c 100644 --- a/drivers/video/matrox/matroxfb_base.c +++ b/drivers/video/matrox/matroxfb_base.c | |||
@@ -1453,6 +1453,13 @@ static struct board { | |||
1453 | MGA_G100, | 1453 | MGA_G100, |
1454 | &vbG100, | 1454 | &vbG100, |
1455 | "MGA-G100 (AGP)"}, | 1455 | "MGA-G100 (AGP)"}, |
1456 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI, 0xFF, | ||
1457 | 0, 0, | ||
1458 | DEVF_G200, | ||
1459 | 230000, | ||
1460 | MGA_G200, | ||
1461 | &vbG200, | ||
1462 | "MGA-G200eV (PCI)"}, | ||
1456 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, 0xFF, | 1463 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, 0xFF, |
1457 | 0, 0, | 1464 | 0, 0, |
1458 | DEVF_G200, | 1465 | DEVF_G200, |
@@ -2118,6 +2125,8 @@ static struct pci_device_id matroxfb_devices[] = { | |||
2118 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 2125 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
2119 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_AGP, | 2126 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G100_AGP, |
2120 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 2127 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
2128 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200EV_PCI, | ||
2129 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | ||
2121 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, | 2130 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_PCI, |
2122 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, | 2131 | PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, |
2123 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_AGP, | 2132 | {PCI_VENDOR_ID_MATROX, PCI_DEVICE_ID_MATROX_G200_AGP, |
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h index 1176f1f177e2..8edddc240e4f 100644 --- a/include/linux/pci_ids.h +++ b/include/linux/pci_ids.h | |||
@@ -587,6 +587,7 @@ | |||
587 | #define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520 | 587 | #define PCI_DEVICE_ID_MATROX_G200_PCI 0x0520 |
588 | #define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521 | 588 | #define PCI_DEVICE_ID_MATROX_G200_AGP 0x0521 |
589 | #define PCI_DEVICE_ID_MATROX_G400 0x0525 | 589 | #define PCI_DEVICE_ID_MATROX_G400 0x0525 |
590 | #define PCI_DEVICE_ID_MATROX_G200EV_PCI 0x0530 | ||
590 | #define PCI_DEVICE_ID_MATROX_G550 0x2527 | 591 | #define PCI_DEVICE_ID_MATROX_G550 0x2527 |
591 | #define PCI_DEVICE_ID_MATROX_VIA 0x4536 | 592 | #define PCI_DEVICE_ID_MATROX_VIA 0x4536 |
592 | 593 | ||