diff options
| author | Jonathan Gray <jsg@jsg.id.au> | 2013-02-28 14:32:56 +1100 |
|---|---|---|
| committer | Jonathan Gray <jsg@jsg.id.au> | 2013-02-28 14:32:56 +1100 |
| commit | 468de33100d1e1ce8501a36750cf203875b045f8 (patch) | |
| tree | 35642f10370dea6894abb9b787a0f49d074f2920 /sys/dev | |
| parent | 26ddd8e1ac6d6164b9be99e58770924a87b770c7 (diff) | |
make use of wakeup_pending
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915_irq.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/sys/dev/pci/drm/i915_irq.c b/sys/dev/pci/drm/i915_irq.c index 5b73e65e24a..05fd5c16ed5 100644 --- a/sys/dev/pci/drm/i915_irq.c +++ b/sys/dev/pci/drm/i915_irq.c @@ -1774,17 +1774,12 @@ 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. */ -#ifdef notyet - if (waitqueue_active(&ring->irq_queue)) { + if (wakeup_pending(ring)) { DRM_ERROR("Hangcheck timer elapsed... %s idle\n", ring->name); - wake_up_all(&ring->irq_queue); + wakeup(ring); *err = true; } -#else - wakeup(ring); - *err = true; -#endif return true; } return false; |