diff options
| author | Eric Anholt <eric@anholt.net> | 2009-10-22 19:11:14 -0400 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2010-02-26 16:23:17 -0500 |
| commit | bad720ff3e8e47a04bd88d9bbc8317e7d7e049d3 (patch) | |
| tree | f799c660fbe0530398366f46da0fb25381b78978 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 1089e3009572e07a1fe12c3408828f27c96453be (diff) | |
drm/i915: Add initial bits for VGA modesetting bringup on Sandybridge.
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 b5df30ca0fa2..a35dc8c0882b 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c | |||
| @@ -1818,7 +1818,7 @@ i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptible) | |||
| 1818 | return -EIO; | 1818 | return -EIO; |
| 1819 | 1819 | ||
| 1820 | if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) { | 1820 | if (!i915_seqno_passed(i915_get_gem_seqno(dev), seqno)) { |
| 1821 | if (IS_IRONLAKE(dev)) | 1821 | if (HAS_PCH_SPLIT(dev)) |
| 1822 | ier = I915_READ(DEIER) | I915_READ(GTIER); | 1822 | ier = I915_READ(DEIER) | I915_READ(GTIER); |
| 1823 | else | 1823 | else |
| 1824 | ier = I915_READ(IER); | 1824 | ier = I915_READ(IER); |