]>
Commit | Line | Data |
---|---|---|
4d1027fb | 1 | --- XFree86-4.2.0/xc.orig/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Mon Jan 21 02:55:00 2002 |
2 | +++ XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/common/xf86PciInfo.h Mon Jan 21 03:01:54 2002 | |
3 | @@ -644,6 +644,7 @@ | |
4 | /* Intel */ | |
5 | #define PCI_CHIP_I830_M_BRIDGE 0x3575 | |
6 | #define PCI_CHIP_I830_M 0x3577 | |
7 | +#define PCI_CHIP_I815_M 0x1112 | |
8 | #define PCI_CHIP_I815_BRIDGE 0x1130 | |
9 | #define PCI_CHIP_I815 0x1132 | |
10 | #define PCI_CHIP_I810_BRIDGE 0x7120 | |
11 | @@ -1599,6 +1600,7 @@ | |
12 | {PCI_CHIP_I810_BRIDGE, "i810 Bridge",0}, | |
13 | {PCI_CHIP_I810_DC100_BRIDGE, "i810-dc100 Bridge",0}, | |
14 | {PCI_CHIP_I810_E_BRIDGE,"i810e Bridge",0}, | |
15 | + {PCI_CHIP_I815_M, "i815m",0}, | |
16 | {PCI_CHIP_I815_BRIDGE, "i815 Bridge",0}, | |
17 | {PCI_CHIP_I830_M_BRIDGE,"i830M Bridge",0}, | |
18 | #endif | |
19 | --- XFree86-4.2.0/xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i810.h Tue Jan 15 03:43:51 2002 | |
20 | +++ XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/drivers/i810/i810.h Mon Jan 21 02:59:17 2002 | |
21 | @@ -798,6 +798,7 @@ | |
22 | #define PCI_CHIP_I810 0x7121 | |
23 | #define PCI_CHIP_I810_DC100 0x7123 | |
24 | #define PCI_CHIP_I810_E 0x7125 | |
25 | +#define PCI_CHIP_I815_M 0x1112 | |
26 | #define PCI_CHIP_I815 0x1132 | |
27 | #define PCI_CHIP_I810_BRIDGE 0x7120 | |
28 | #define PCI_CHIP_I810_DC100_BRIDGE 0x7122 | |
29 | @@ -809,7 +810,8 @@ | |
30 | #define IS_I810(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I810 || \ | |
31 | pI810->PciInfo->chipType == PCI_CHIP_I810_DC100 || \ | |
32 | pI810->PciInfo->chipType == PCI_CHIP_I810_E) | |
33 | -#define IS_I815(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I815) | |
34 | +#define IS_I815(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I815 || \ | |
35 | + pI810->PciInfo->chipType == PCI_CHIP_I815_M) | |
36 | #define IS_I830(pI810) (pI810->PciInfo->chipType == PCI_CHIP_I830_M) | |
37 | ||
38 | ||
39 | --- XFree86-4.2.0/xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Thu Jan 10 01:02:29 2002 | |
40 | +++ XFree86-4.2.0/xc/programs/Xserver/hw/xfree86/drivers/i810/i810_driver.c Mon Jan 21 03:00:42 2002 | |
41 | @@ -101,7 +101,8 @@ | |
42 | { PCI_CHIP_I810, "i810"}, | |
43 | { PCI_CHIP_I810_DC100, "i810-dc100"}, | |
44 | { PCI_CHIP_I810_E, "i810e"}, | |
45 | - { PCI_CHIP_I815, "i815"}, | |
46 | + { PCI_CHIP_I815, "i815"}, | |
47 | + { PCI_CHIP_I815_M, "i815m"}, | |
48 | { PCI_CHIP_I830_M, "i830M"}, | |
49 | { -1, NULL } | |
50 | }; | |
51 | @@ -110,7 +111,8 @@ | |
52 | { PCI_CHIP_I810, PCI_CHIP_I810, RES_SHARED_VGA }, | |
53 | { PCI_CHIP_I810_DC100, PCI_CHIP_I810_DC100, RES_SHARED_VGA }, | |
54 | { PCI_CHIP_I810_E, PCI_CHIP_I810_E, RES_SHARED_VGA }, | |
55 | - { PCI_CHIP_I815, PCI_CHIP_I815, RES_SHARED_VGA }, | |
56 | + { PCI_CHIP_I815, PCI_CHIP_I815, RES_SHARED_VGA }, | |
57 | + { PCI_CHIP_I815_M, PCI_CHIP_I815_M, RES_SHARED_VGA }, | |
58 | { PCI_CHIP_I830_M, PCI_CHIP_I830_M, RES_SHARED_VGA }, | |
59 | { -1, -1, RES_UNDEFINED } | |
60 | }; |