summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonathan Gray <jsg@jsg.id.au>2013-03-15 15:24:21 +1100
committerJonathan Gray <jsg@jsg.id.au>2013-03-15 15:24:21 +1100
commitbc60e211dccec39486102c311edf52434b26b53e (patch)
tree09d7bf4d19a710e7ab5b7eaaea54f205cbc27ad9
parent52685f417729ae0089f640bc756c8160830c8618 (diff)
switch from wakeup_pending() to wakeup()
-rw-r--r--sys/dev/pci/drm/i915/i915_irq.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/sys/dev/pci/drm/i915/i915_irq.c b/sys/dev/pci/drm/i915/i915_irq.c
index 460e6219a27..d498057b2de 100644
--- a/sys/dev/pci/drm/i915/i915_irq.c
+++ b/sys/dev/pci/drm/i915/i915_irq.c
@@ -1782,10 +1782,9 @@ i915_hangcheck_ring_idle(struct intel_ring_buffer *ring, bool *err)
i915_seqno_passed(ring->get_seqno(ring, false),
ring_last_seqno(ring))) {
/* Issue a wake-up to catch stuck h/w. */
- if (wakeup_pending(ring)) {
+ if (wakeup(ring) > 0) {
DRM_ERROR("Hangcheck timer elapsed... %s idle\n",
ring->name);
- wakeup(ring);
*err = true;
}
return true;