summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2007-03-30 12:56:34 -0700
committerEric Anholt <eric@anholt.net>2007-03-30 13:11:39 -0700
commitddb1715e06f6b5ab81ed0bc6667104bb9e7fcdee (patch)
tree704c40f041cae193b35938790d1860a84b6343cc
parentcd4c82176f3f429e722ca3fac2abf231af479780 (diff)
parent406a894e529267177e6161c1713f2aa2293e7734 (diff)
Merge branch 'crestline-qa', adding support for the 965GM chipset.
-rw-r--r--shared-core/drm_pciids.txt1
-rw-r--r--shared-core/i915_dma.c3
2 files changed, 3 insertions, 1 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index a1bc907b..5cea11a7 100644
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -279,6 +279,7 @@
0x8086 0x2982 CHIP_I9XX|CHIP_I965 "Intel i965G"
0x8086 0x2992 CHIP_I9XX|CHIP_I965 "Intel i965Q"
0x8086 0x29A2 CHIP_I9XX|CHIP_I965 "Intel i965G"
+0x8086 0x2A02 CHIP_I9XX|CHIP_I965 "Intel i965GM"
[imagine]
0x105d 0x2309 IMAGINE_128 "Imagine 128"
diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 9053f544..aed3eea1 100644
--- a/shared-core/i915_dma.c
+++ b/shared-core/i915_dma.c
@@ -34,7 +34,8 @@
#define IS_I965G(dev) (dev->pci_device == 0x2972 || \
dev->pci_device == 0x2982 || \
dev->pci_device == 0x2992 || \
- dev->pci_device == 0x29A2)
+ dev->pci_device == 0x29A2 || \
+ dev->pci_device == 0x2A02)
/* Really want an OS-independent resettable timer. Would like to have