diff options
| author | Adam Jackson | 2009-12-03 23:14:42 +0100 |
|---|---|---|
| committer | Eric Anholt | 2009-12-07 23:55:56 +0100 |
| commit | f2b115e69d46344ae7afcaad5823496d2a0d8650 (patch) | |
| tree | 8bf56f7d43e3462a26088317bad04f04b676d26c /drivers/gpu/drm/i915/i915_gem.c | |
| parent | agp/intel: Fix product names and #defines (diff) | |
| download | kernel-qcow2-linux-f2b115e69d46344ae7afcaad5823496d2a0d8650.tar.gz kernel-qcow2-linux-f2b115e69d46344ae7afcaad5823496d2a0d8650.tar.xz kernel-qcow2-linux-f2b115e69d46344ae7afcaad5823496d2a0d8650.zip | |
drm/i915: Fix product names and #defines
IGD* isn't a useful name. Replace with the codenames, as sourced from
pci.ids.
Signed-off-by: Adam Jackson <ajax@redhat.com>
[anholt: Fixed up for merge with pineview/ironlake changes]
Signed-off-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index fd5363995044..5b46623d62d4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1833,7 +1833,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) return -EIO; if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) { - if (IS_IGDNG(dev)) + if (IS_IRONLAKE(dev)) ier = I915_READ(DEIER) | I915_READ(GTIER); else ier = I915_READ(IER); |