diff options
author | Jonathan Gray <jsg@jsg.id.au> | 2013-03-18 21:37:20 +1100 |
---|---|---|
committer | Jonathan Gray <jsg@jsg.id.au> | 2013-03-18 21:37:20 +1100 |
commit | c1d76daf2e0c8ab8c962e3b7cc2c17fe5db5765e (patch) | |
tree | ea7eb0b718ac7e8b2729131b4f67b4b272951e12 | |
parent | 0bc727776cfa186778886ee856d8008cafb9ca63 (diff) |
skip the pending wakeup error path for now
-rw-r--r-- | sys/dev/pci/drm/i915/i915_irq.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/dev/pci/drm/i915/i915_irq.c b/sys/dev/pci/drm/i915/i915_irq.c index d498057b2de..d5f3f2ff871 100644 --- a/sys/dev/pci/drm/i915/i915_irq.c +++ b/sys/dev/pci/drm/i915/i915_irq.c @@ -1782,11 +1782,15 @@ 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 (wakeup(ring) > 0) { DRM_ERROR("Hangcheck timer elapsed... %s idle\n", ring->name); *err = true; } +#else + wakeup(ring); +#endif return true; } return false; |