diff options
author | Carlos MartÃn <inean@users.sf.net> | 2008-01-23 19:34:09 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-01-23 21:04:55 -0500 |
commit | e914a36ac7158235e3f65f0b33bc001a4193e0b5 (patch) | |
tree | 1140af1efafc54cf4665c3b202d973069b1b66b4 | |
parent | f9c4cfe95451b7f4531d73d2a8a6651cba9760ab (diff) |
agp/intel: add support for E7221 chipset
The E7221 chipset is a 915 rebadged for the Intel server line.
Signed-off-by: Dave Airlie <airlied@linux.ie>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r-- | drivers/char/agp/intel-agp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c index d87961993ccf..03eac1eb8e0f 100644 --- a/drivers/char/agp/intel-agp.c +++ b/drivers/char/agp/intel-agp.c | |||
@@ -10,6 +10,8 @@ | |||
10 | #include <linux/agp_backend.h> | 10 | #include <linux/agp_backend.h> |
11 | #include "agp.h" | 11 | #include "agp.h" |
12 | 12 | ||
13 | #define PCI_DEVICE_ID_INTEL_E7221_HB 0x2588 | ||
14 | #define PCI_DEVICE_ID_INTEL_E7221_IG 0x258a | ||
13 | #define PCI_DEVICE_ID_INTEL_82946GZ_HB 0x2970 | 15 | #define PCI_DEVICE_ID_INTEL_82946GZ_HB 0x2970 |
14 | #define PCI_DEVICE_ID_INTEL_82946GZ_IG 0x2972 | 16 | #define PCI_DEVICE_ID_INTEL_82946GZ_IG 0x2972 |
15 | #define PCI_DEVICE_ID_INTEL_82965G_1_HB 0x2980 | 17 | #define PCI_DEVICE_ID_INTEL_82965G_1_HB 0x2980 |
@@ -526,7 +528,8 @@ static void intel_i830_init_gtt_entries(void) | |||
526 | break; | 528 | break; |
527 | case I915_GMCH_GMS_STOLEN_48M: | 529 | case I915_GMCH_GMS_STOLEN_48M: |
528 | /* Check it's really I915G */ | 530 | /* Check it's really I915G */ |
529 | if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || | 531 | if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || |
532 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || | ||
530 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || | 533 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || |
531 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB || | 534 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB || |
532 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB || | 535 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB || |
@@ -538,7 +541,8 @@ static void intel_i830_init_gtt_entries(void) | |||
538 | break; | 541 | break; |
539 | case I915_GMCH_GMS_STOLEN_64M: | 542 | case I915_GMCH_GMS_STOLEN_64M: |
540 | /* Check it's really I915G */ | 543 | /* Check it's really I915G */ |
541 | if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || | 544 | if (agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_E7221_HB || |
545 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915G_HB || | ||
542 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || | 546 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82915GM_HB || |
543 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB || | 547 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945G_HB || |
544 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB || | 548 | agp_bridge->dev->device == PCI_DEVICE_ID_INTEL_82945GM_HB || |
@@ -1854,6 +1858,8 @@ static const struct intel_driver_description { | |||
1854 | { PCI_DEVICE_ID_INTEL_82865_HB, PCI_DEVICE_ID_INTEL_82865_IG, 0, "865", | 1858 | { PCI_DEVICE_ID_INTEL_82865_HB, PCI_DEVICE_ID_INTEL_82865_IG, 0, "865", |
1855 | &intel_845_driver, &intel_830_driver }, | 1859 | &intel_845_driver, &intel_830_driver }, |
1856 | { PCI_DEVICE_ID_INTEL_82875_HB, 0, 0, "i875", &intel_845_driver, NULL }, | 1860 | { PCI_DEVICE_ID_INTEL_82875_HB, 0, 0, "i875", &intel_845_driver, NULL }, |
1861 | { PCI_DEVICE_ID_INTEL_E7221_HB, PCI_DEVICE_ID_INTEL_E7221_IG, 0, "E7221 (i915)", | ||
1862 | NULL, &intel_915_driver }, | ||
1857 | { PCI_DEVICE_ID_INTEL_82915G_HB, PCI_DEVICE_ID_INTEL_82915G_IG, 0, "915G", | 1863 | { PCI_DEVICE_ID_INTEL_82915G_HB, PCI_DEVICE_ID_INTEL_82915G_IG, 0, "915G", |
1858 | NULL, &intel_915_driver }, | 1864 | NULL, &intel_915_driver }, |
1859 | { PCI_DEVICE_ID_INTEL_82915GM_HB, PCI_DEVICE_ID_INTEL_82915GM_IG, 0, "915GM", | 1865 | { PCI_DEVICE_ID_INTEL_82915GM_HB, PCI_DEVICE_ID_INTEL_82915GM_IG, 0, "915GM", |
@@ -2059,6 +2065,7 @@ static struct pci_device_id agp_intel_pci_table[] = { | |||
2059 | ID(PCI_DEVICE_ID_INTEL_82875_HB), | 2065 | ID(PCI_DEVICE_ID_INTEL_82875_HB), |
2060 | ID(PCI_DEVICE_ID_INTEL_7505_0), | 2066 | ID(PCI_DEVICE_ID_INTEL_7505_0), |
2061 | ID(PCI_DEVICE_ID_INTEL_7205_0), | 2067 | ID(PCI_DEVICE_ID_INTEL_7205_0), |
2068 | ID(PCI_DEVICE_ID_INTEL_E7221_HB), | ||
2062 | ID(PCI_DEVICE_ID_INTEL_82915G_HB), | 2069 | ID(PCI_DEVICE_ID_INTEL_82915G_HB), |
2063 | ID(PCI_DEVICE_ID_INTEL_82915GM_HB), | 2070 | ID(PCI_DEVICE_ID_INTEL_82915GM_HB), |
2064 | ID(PCI_DEVICE_ID_INTEL_82945G_HB), | 2071 | ID(PCI_DEVICE_ID_INTEL_82945G_HB), |