diff options
| author | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-07-03 00:49:19 +0800 |
|---|---|---|
| committer | Zhenyu Wang <zhenyu.z.wang@intel.com> | 2008-07-03 00:49:51 +0800 |
| commit | 401f77a2ef1d55feaccc13cdae1e5379f4cfec7e (patch) | |
| tree | 12bbeb4f7e3793c6d1082818e16e13a84afbdb6c /shared-core | |
| parent | 301d984ea80cb250460d6701c4373cf0af8bf59e (diff) | |
i915: official name for GM45 chipset
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Diffstat (limited to 'shared-core')
| -rw-r--r-- | shared-core/drm_pciids.txt | 2 | ||||
| -rw-r--r-- | shared-core/i915_drv.h | 6 | ||||
| -rw-r--r-- | shared-core/i915_suspend.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/shared-core/drm_pciids.txt b/shared-core/drm_pciids.txt index dd88ebab..205fc539 100644 --- a/shared-core/drm_pciids.txt +++ b/shared-core/drm_pciids.txt @@ -394,7 +394,7 @@ 0x8086 0x29C2 CHIP_I9XX|CHIP_I915 "Intel G33" 0x8086 0x29B2 CHIP_I9XX|CHIP_I915 "Intel Q35" 0x8086 0x29D2 CHIP_I9XX|CHIP_I915 "Intel Q33" -0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device" +0x8086 0x2A42 CHIP_I9XX|CHIP_I965 "Mobile Intel® GM45 Express Chipset" 0x8086 0x2E02 CHIP_I9XX|CHIP_I965 "Intel Integrated Graphics Device" 0x8086 0x2E12 CHIP_I9XX|CHIP_I965 "Intel Q45/Q43" 0x8086 0x2E22 CHIP_I9XX|CHIP_I965 "Intel G45/G43" diff --git a/shared-core/i915_drv.h b/shared-core/i915_drv.h index 3ba74db8..fa3305ba 100644 --- a/shared-core/i915_drv.h +++ b/shared-core/i915_drv.h @@ -1801,7 +1801,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02) -#define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42) +#define IS_GM45(dev) ((dev)->pci_device == 0x2A42) #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \ (dev)->pci_device == 0x2E12 || \ @@ -1815,8 +1815,8 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev)) #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \ - IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev)) + IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev)) -#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev) || IS_G4X(dev)) +#define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev)) #endif diff --git a/shared-core/i915_suspend.c b/shared-core/i915_suspend.c index 63cd54a2..5e759b15 100644 --- a/shared-core/i915_suspend.c +++ b/shared-core/i915_suspend.c @@ -299,7 +299,7 @@ int i915_save_state(struct drm_device *dev) dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE); dev_priv->saveDSPBPOS = I915_READ(DSPBPOS); dev_priv->saveDSPBADDR = I915_READ(DSPBADDR); - if (IS_I965GM(dev) || IS_IGD_GM(dev)) { + if (IS_I965GM(dev) || IS_GM45(dev)) { dev_priv->saveDSPBSURF = I915_READ(DSPBSURF); dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF); } |