summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMa Ling <ling.ma@intel.com>2009-05-13 15:08:27 +0800
committerEric Anholt <eric@anholt.net>2009-05-14 16:00:30 -0700
commitc9ed4486bdee3b54cb544fc181057bc6bf1ae45c (patch)
tree11b28f169e46a22dea7d1a235d83d3c89e2705e8
parente92597cffffabe9a9a85db462045330970c498d0 (diff)
downloadlinux-3.10-c9ed4486bdee3b54cb544fc181057bc6bf1ae45c.tar.gz
linux-3.10-c9ed4486bdee3b54cb544fc181057bc6bf1ae45c.tar.bz2
linux-3.10-c9ed4486bdee3b54cb544fc181057bc6bf1ae45c.zip
drm/i915: Include 965GME pci ID in IS_I965GM(dev) to match UMS.
It fixed bug #21659 Signed-off-by: Ma Ling <ling.ma@intel.com> [anholt: hand-applied because git-am is too picky] Signed-off-by: Eric Anholt <eric@anholt.net>
-rw-r--r--drivers/gpu/drm/i915/i915_drv.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
index b47af07f391..9b149fe824c 100644
--- a/drivers/gpu/drm/i915/i915_drv.h
+++ b/drivers/gpu/drm/i915/i915_drv.h
@@ -786,7 +786,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller);
(dev)->pci_device == 0x2E22 || \
(dev)->pci_device == 0x2E32)
-#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02)
+#define IS_I965GM(dev) ((dev)->pci_device == 0x2A02 || \
+ (dev)->pci_device == 0x2A12)
#define IS_GM45(dev) ((dev)->pci_device == 0x2A42)