diff options
author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2008-08-25 18:16:19 -0400 |
---|---|---|
committer | Dave Airlie <airlied@linux.ie> | 2008-10-17 17:10:11 -0400 |
commit | b9bfdfe6703eb089839d48316a79c84924a3c335 (patch) | |
tree | 320be599b3e68e1be8879439812ce4a80795bef7 | |
parent | 317c35d1446f68b34d4de4e1100fc01680bd4877 (diff) |
new chip name is GM45
Author: Zhenyu Wang <zhenyu.z.wang@intel.com>
i915: official name for GM45 chipset
Signed-off-by: Zhenyu Wang <zhenyu.z.wang@intel.com>
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Dave Airlie <airlied@redhat.com>
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.h | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_suspend.c | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index a82b487de7b1..71326ca9367a 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h | |||
@@ -364,7 +364,7 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
364 | 364 | ||
365 | #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02) | 365 | #define IS_I965GM(dev) ((dev)->pci_device == 0x2A02) |
366 | 366 | ||
367 | #define IS_IGD_GM(dev) ((dev)->pci_device == 0x2A42) | 367 | #define IS_GM45(dev) ((dev)->pci_device == 0x2A42) |
368 | 368 | ||
369 | #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \ | 369 | #define IS_G4X(dev) ((dev)->pci_device == 0x2E02 || \ |
370 | (dev)->pci_device == 0x2E12 || \ | 370 | (dev)->pci_device == 0x2E12 || \ |
@@ -378,9 +378,9 @@ extern int i915_wait_ring(struct drm_device * dev, int n, const char *caller); | |||
378 | IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev)) | 378 | IS_I945GM(dev) || IS_I965G(dev) || IS_G33(dev)) |
379 | 379 | ||
380 | #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \ | 380 | #define IS_MOBILE(dev) (IS_I830(dev) || IS_I85X(dev) || IS_I915GM(dev) || \ |
381 | IS_I945GM(dev) || IS_I965GM(dev) || IS_IGD_GM(dev)) | 381 | IS_I945GM(dev) || IS_I965GM(dev) || IS_GM45(dev)) |
382 | 382 | ||
383 | #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_IGD_GM(dev) || IS_G4X(dev)) | 383 | #define I915_NEED_GFX_HWS(dev) (IS_G33(dev) || IS_GM45(dev) || IS_G4X(dev)) |
384 | 384 | ||
385 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) | 385 | #define PRIMARY_RINGBUFFER_SIZE (128*1024) |
386 | 386 | ||
diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index e0c1fe4d1b85..603fe742ccd4 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c | |||
@@ -292,7 +292,7 @@ int i915_save_state(struct drm_device *dev) | |||
292 | dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE); | 292 | dev_priv->saveDSPBSIZE = I915_READ(DSPBSIZE); |
293 | dev_priv->saveDSPBPOS = I915_READ(DSPBPOS); | 293 | dev_priv->saveDSPBPOS = I915_READ(DSPBPOS); |
294 | dev_priv->saveDSPBADDR = I915_READ(DSPBADDR); | 294 | dev_priv->saveDSPBADDR = I915_READ(DSPBADDR); |
295 | if (IS_I965GM(dev) || IS_IGD_GM(dev)) { | 295 | if (IS_I965GM(dev) || IS_GM45(dev)) { |
296 | dev_priv->saveDSPBSURF = I915_READ(DSPBSURF); | 296 | dev_priv->saveDSPBSURF = I915_READ(DSPBSURF); |
297 | dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF); | 297 | dev_priv->saveDSPBTILEOFF = I915_READ(DSPBTILEOFF); |
298 | } | 298 | } |