projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e92597c
)
drm/i915: Include 965GME pci ID in IS_I965GM(dev) to match UMS.
author
Ma Ling
<ling.ma@intel.com>
Wed, 13 May 2009 07:08:27 +0000
(15:08 +0800)
committer
Eric Anholt
<eric@anholt.net>
Thu, 14 May 2009 23:00:30 +0000
(16:00 -0700)
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>
drivers/gpu/drm/i915/i915_drv.h
patch
|
blob
|
history
diff --git
a/drivers/gpu/drm/i915/i915_drv.h
b/drivers/gpu/drm/i915/i915_drv.h
index b47af07f3918a4588e5f92ad045a3dbe681c71f6..9b149fe824c37fef0a8618886d4ff90e5f45b159 100644
(file)
--- 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)