Merge branch 'master' into crestline

diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt
index 0b95fe7..dc921d9 100644 (file)
--- a/shared-core/drm_pciids.txt
+++ b/shared-core/drm_pciids.txt
@@ -278,6 +278,7 @@
 0x8086 0x2982 0 "Intel i965G"
 0x8086 0x2992 0 "Intel i965Q"
 0x8086 0x29A2 0 "Intel i965G"
+0x8086 0x2A02 0 "Intel Crestline"
 
 [imagine]
 0x105d 0x2309 IMAGINE_128 "Imagine 128"

diff --git a/shared-core/i915_dma.c b/shared-core/i915_dma.c
index 912fe0b..a2f1243 100644 (file)
--- 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