diff options
| author | Ma Ling <ling.ma@intel.com> | 2009-05-13 09:08:27 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-05-15 01:00:30 +0200 |
| commit | c9ed4486bdee3b54cb544fc181057bc6bf1ae45c (patch) | |
| tree | 11b28f169e46a22dea7d1a235d83d3c89e2705e8 | |
| parent | drm/i915: Use the GM45 VGA hotplug workaround on G45 as well. (diff) | |
| download | linux-c9ed4486bdee3b54cb544fc181057bc6bf1ae45c.tar.xz linux-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.h | 3 |
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 b47af07f3918..9b149fe824c3 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) |