diff options
| author |   kettenis <kettenis@openbsd.org> | 2013-03-28 20:37:50 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2013-03-28 20:37:50 +0000 |
| commit | df6e29439b42c4213c02abbe5bb78499d5cc6e15 (patch) | |
| tree | b7948ddc52a77808a189cf850fe8ec8cf771f9c1 /sys/dev | |
| parent | shuffle the KERNEL BUILDING text a little; from daniel dickman (diff) | |
| download | wireguard-openbsd-df6e29439b42c4213c02abbe5bb78499d5cc6e15.tar.xz wireguard-openbsd-df6e29439b42c4213c02abbe5bb78499d5cc6e15.zip | |
Reduce diffs with Linux now that we have i915_enable_hangcheck.
Diffstat (limited to 'sys/dev')
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_irq.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/sys/dev/pci/drm/i915/i915_irq.c b/sys/dev/pci/drm/i915/i915_irq.c index 2ade5520e0d..bb10448020a 100644 --- a/sys/dev/pci/drm/i915/i915_irq.c +++ b/sys/dev/pci/drm/i915/i915_irq.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_irq.c,v 1.3 2013/03/21 08:27:32 jsg Exp $ */ +/* $OpenBSD: i915_irq.c,v 1.4 2013/03/28 20:37:50 kettenis Exp $ */ /* i915_irq.c -- IRQ support for the I915 -*- linux-c -*- */ /* @@ -416,17 +416,11 @@ notify_ring(struct drm_device *dev, // trace_i915_gem_request_complete(ring, ring->get_seqno(ring, false)); wakeup(ring); - dev_priv->hangcheck_count = 0; - timeout_add_msec(&dev_priv->hangcheck_timer, DRM_I915_HANGCHECK_PERIOD); - -#ifdef notyet - wakeup(&ring->irq_queue); if (i915_enable_hangcheck) { dev_priv->hangcheck_count = 0; - mod_timer(&dev_priv->hangcheck_timer, - round_jiffies_up(jiffies + DRM_I915_HANGCHECK_JIFFIES)); + timeout_add_msec(&dev_priv->hangcheck_timer, + DRM_I915_HANGCHECK_PERIOD); } -#endif } void @@ -1849,10 +1843,8 @@ i915_hangcheck_elapsed(void *arg) bool err = false, idle; int i; -#ifdef notyet if (!i915_enable_hangcheck) return; -#endif memset(acthd, 0, sizeof(acthd)); idle = true; |