diff options
| author | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-09-08 00:56:34 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyuw@linux.intel.com> | 2009-09-08 00:56:34 +0800 |
| commit | ce10b5b6fca086eb4af45c1db28352e06ee4ce0b (patch) | |
| tree | f3cc511b0875bd5648cfdcc01e1f2f0e8e93136d | |
| parent | 94fc93d4e2b88565dca17f72903d8991213c9ee8 (diff) | |
Add B43 chipset support
Signed-off-by: Zhenyu Wang <zhenyuw@linux.intel.com>
| -rw-r--r-- | src/common.h | 7 | ||||
| -rw-r--r-- | src/i810_driver.c | 3 | ||||
| -rw-r--r-- | src/i830_driver.c | 5 |
3 files changed, 14 insertions, 1 deletions
diff --git a/src/common.h b/src/common.h index 69f56041..79c656a5 100644 --- a/src/common.h +++ b/src/common.h @@ -310,6 +310,11 @@ extern int I810_DEBUG; #define PCI_CHIP_G41_G_BRIDGE 0x2E30 #endif +#ifndef PCI_CHIP_B43_G +#define PCI_CHIP_B43_G 0x2E42 +#define PCI_CHIP_B43_G_BRIDGE 0x2E40 +#endif + #ifndef PCI_CHIP_IGDNG_D_G #define PCI_CHIP_IGDNG_D_G 0x0042 #define PCI_CHIP_IGDNG_D_G_BRIDGE 0x0040 @@ -346,7 +351,7 @@ extern int I810_DEBUG; #define IS_IGDG(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_G) #define IS_IGD(pI810) (IS_IGDG(pI810) || IS_IGDGM(pI810)) #define IS_GM45(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_GM45_GM) -#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || IS_GM45(pI810)) +#define IS_G4X(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGD_E_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_Q45_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_G41_G || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_B43_G || IS_GM45(pI810)) #define IS_I965GM(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GM || DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_GME) #define IS_965_Q(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_I965_Q) #define IS_IGDNG_D(pI810) (DEVICE_ID(pI810->PciInfo) == PCI_CHIP_IGDNG_D_G) diff --git a/src/i810_driver.c b/src/i810_driver.c index 7961c3d8..bb3bad80 100644 --- a/src/i810_driver.c +++ b/src/i810_driver.c @@ -137,6 +137,7 @@ static const struct pci_id_match intel_device_match[] = { INTEL_DEVICE_MATCH (PCI_CHIP_G45_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_Q45_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_G41_G, 0 ), + INTEL_DEVICE_MATCH (PCI_CHIP_B43_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_D_G, 0 ), INTEL_DEVICE_MATCH (PCI_CHIP_IGDNG_M_G, 0 ), { 0, 0, 0 }, @@ -190,6 +191,7 @@ static SymTabRec I810Chipsets[] = { {PCI_CHIP_G45_G, "G45/G43"}, {PCI_CHIP_Q45_G, "Q45/Q43"}, {PCI_CHIP_G41_G, "G41"}, + {PCI_CHIP_B43_G, "B43"}, {PCI_CHIP_IGDNG_D_G, "Clarkdale"}, {PCI_CHIP_IGDNG_M_G, "Arrandale"}, {-1, NULL} @@ -228,6 +230,7 @@ static PciChipsets I810PciChipsets[] = { {PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL}, {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL}, {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL}, + {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL}, {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL}, {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL}, {-1, -1, NULL } diff --git a/src/i830_driver.c b/src/i830_driver.c index 4334de62..e3e1ed20 100644 --- a/src/i830_driver.c +++ b/src/i830_driver.c @@ -116,6 +116,7 @@ static SymTabRec I830Chipsets[] = { {PCI_CHIP_G45_G, "G45/G43"}, {PCI_CHIP_Q45_G, "Q45/Q43"}, {PCI_CHIP_G41_G, "G41"}, + {PCI_CHIP_B43_G, "B43"}, {PCI_CHIP_IGDNG_D_G, "Clarkdale"}, {PCI_CHIP_IGDNG_M_G, "Arrandale"}, {-1, NULL} @@ -148,6 +149,7 @@ static PciChipsets I830PciChipsets[] = { {PCI_CHIP_G45_G, PCI_CHIP_G45_G, NULL}, {PCI_CHIP_Q45_G, PCI_CHIP_Q45_G, NULL}, {PCI_CHIP_G41_G, PCI_CHIP_G41_G, NULL}, + {PCI_CHIP_B43_G, PCI_CHIP_B43_G, NULL}, {PCI_CHIP_IGDNG_D_G, PCI_CHIP_IGDNG_D_G, NULL}, {PCI_CHIP_IGDNG_M_G, PCI_CHIP_IGDNG_M_G, NULL}, {-1, -1, NULL} @@ -1096,6 +1098,9 @@ i830_detect_chipset(ScrnInfoPtr pScrn) case PCI_CHIP_G41_G: chipname = "G41"; break; + case PCI_CHIP_B43_G: + chipname = "B43"; + break; case PCI_CHIP_IGDNG_D_G: chipname = "Clarkdale"; break; |