diff options
| author | Wang Zhenyu <zhenyu.z.wang@intel.com> | 2007-04-26 07:42:56 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2007-04-26 07:42:56 +1000 |
| commit | ce7dd06372058f9e3e57ee4c0aeba694a43a80ad (patch) | |
| tree | 82f869dcf2caf90fd40da8932a3268307915edc7 /drivers | |
| parent | 9e9c1326a592c677c94d730fcf4446d0e275aef4 (diff) | |
| download | op-kernel-dev-ce7dd06372058f9e3e57ee4c0aeba694a43a80ad.zip op-kernel-dev-ce7dd06372058f9e3e57ee4c0aeba694a43a80ad.tar.gz | |
drm/i915: Add 965GM pci id update
Signed-off-by: Dave Airlie <airlied@linux.ie>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/char/drm/drm_pciids.h | 1 | ||||
| -rw-r--r-- | drivers/char/drm/i915_dma.c | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/char/drm/drm_pciids.h b/drivers/char/drm/drm_pciids.h index 7288855..01cf482 100644 --- a/drivers/char/drm/drm_pciids.h +++ b/drivers/char/drm/drm_pciids.h @@ -296,5 +296,6 @@ {0x8086, 0x2982, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x2992, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0x8086, 0x29a2, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ + {0x8086, 0x2a02, PCI_ANY_ID, PCI_ANY_ID, 0, 0, 0}, \ {0, 0, 0} diff --git a/drivers/char/drm/i915_dma.c b/drivers/char/drm/i915_dma.c index 9354ce3..1ba15d9 100644 --- a/drivers/char/drm/i915_dma.c +++ b/drivers/char/drm/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 * this loop run for (eg) 3 sec, but have the timer reset every time |
