summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@virtuousgeek.org>2012-03-28 22:39:39 +0200
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-03-29 00:11:46 +0200
commit23e3f9b37e7368ee8530ba99907508363feebc14 (patch)
treeff20b909bbeed88848a540831130530a6c077688
parentdrm/i915: ValleyView IRQ support (diff)
downloadlinux-23e3f9b37e7368ee8530ba99907508363feebc14.tar.xz
linux-23e3f9b37e7368ee8530ba99907508363feebc14.zip
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>
-rw-r--r--drivers/gpu/drm/i915/i915_gem.c2
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 b8c6248b25c6..54ca125a405d 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) {