diff options
| author | Jesse Barnes <jbarnes@virtuousgeek.org> | 2012-03-28 13:39:39 -0700 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2012-03-29 00:11:46 +0200 |
| commit | 23e3f9b37e7368ee8530ba99907508363feebc14 (patch) | |
| tree | ff20b909bbeed88848a540831130530a6c077688 /drivers/gpu/drm/i915/i915_gem.c | |
| parent | 7e231dbe0c2a4359472f929732d4200479d8f939 (diff) | |
| download | op-kernel-dev-23e3f9b37e7368ee8530ba99907508363feebc14.zip op-kernel-dev-23e3f9b37e7368ee8530ba99907508363feebc14.tar.gz | |
drm/i915: check for disabled interrupts on ValleyView
Haven't seen this yet, but it doesn't hurt.
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_gem.c')
| -rw-r--r-- | drivers/gpu/drm/i915/i915_gem.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index b8c6248..54ca125 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -1875,6 +1875,8 @@ i915_wait_request(struct intel_ring_buffer *ring, if (!i915_seqno_passed(ring->get_seqno(ring), seqno)) { if (HAS_PCH_SPLIT(ring->dev)) ier = I915_READ(DEIER) | I915_READ(GTIER); + else if (IS_VALLEYVIEW(ring->dev)) + ier = I915_READ(GTIER) | I915_READ(VLV_IER); else ier = I915_READ(IER); if (!ier) { |
