summaryrefslogtreecommitdiff
path: root/shared-core
diff options
context:
space:
mode:
authorDave Airlie <airlied@linux.ie>2008-01-23 16:44:51 +1000
committerDave Airlie <airlied@linux.ie>2008-01-23 16:44:51 +1000
commit2f19fe44983647328a97cb4ce513d773459ca853 (patch)
treeb224e0e2050c48102cb409b20cbbcccf3fefd990 /shared-core
parent531f25cfe9d0319f78fe58260bfed08d5e3e8bcc (diff)
drm/i915: add support for E7221
Diffstat (limited to 'shared-core')
-rw-r--r--shared-core/drm_pciids.txt1
-rw-r--r--shared-core/i915_drv.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 83fbc90d..b14b5241 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -377,6 +377,7 @@
0x8086 0x3582 CHIP_I8XX "Intel i852GM/i855GM GMCH"
0x8086 0x2572 CHIP_I8XX "Intel i865G GMCH"
0x8086 0x2582 CHIP_I9XX|CHIP_I915 "Intel i915G"
+0x8086 0x258a CHIP_I9XX|CHIP_I915 "Intel E7221 (i915)"
0x8086 0x2592 CHIP_I9XX|CHIP_I915 "Intel i915GM"
0x8086 0x2772 CHIP_I9XX|CHIP_I915 "Intel i945G"
0x8086 0x27A2 CHIP_I9XX|CHIP_I915 "Intel i945GM"
diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h
index 2c1f2c2e..8260529b 100644
--- a/shared-core/i915_drv.h
+++ b/shared-core/i915_drv.h
@@ -1194,7 +1194,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
#define IS_I855(dev) ((dev)->pci_device == 0x3582)
#define IS_I865G(dev) ((dev)->pci_device == 0x2572)
-#define IS_I915G(dev) (dev->pci_device == 0x2582)/* || dev->pci_device == PCI_DEVICE_ID_INTELPCI_CHIP_E7221_G)*/
+#define IS_I915G(dev) ((dev)->pci_device == 0x2582) || (dev)->pci_device == 0x258a)
#define IS_I915GM(dev) ((dev)->pci_device == 0x2592)
#define IS_I945G(dev) ((dev)->pci_device == 0x2772)
#define IS_I945GM(dev) ((dev)->pci_device == 0x27A2)