diff options
| author |   kettenis <kettenis@openbsd.org> | 2014-02-05 10:58:48 +0000 |
|---|---|---|
| committer | kettenis <kettenis@openbsd.org> | 2014-02-05 10:58:48 +0000 |
| commit | 5799ca123ae0e471b43d45e1eed04cd231ed7701 (patch) | |
| tree | 1ef76524ad239496001c469c9cb25732aef0e76f | |
| parent | Do proper error handling in the fault handler. Fixes spurious SIGSEGVs as (diff) | |
| download | wireguard-openbsd-5799ca123ae0e471b43d45e1eed04cd231ed7701.tar.xz wireguard-openbsd-5799ca123ae0e471b43d45e1eed04cd231ed7701.zip | |
We have WARN_ONCE now.
| -rw-r--r-- | sys/dev/pci/drm/i915/i915_irq.c | 4 | ||||
| -rw-r--r-- | sys/dev/pci/drm/i915/intel_display.c | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/sys/dev/pci/drm/i915/i915_irq.c b/sys/dev/pci/drm/i915/i915_irq.c index 8b0710464ad..4defba0c522 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.10 2014/01/24 04:05:06 jsg Exp $ */ +/* $OpenBSD: i915_irq.c,v 1.11 2014/02/05 10:58:48 kettenis Exp $ */ /* i915_irq.c -- IRQ support for the I915 -*- linux-c -*- */ /* @@ -874,7 +874,7 @@ static void i915_get_extra_instdone(struct drm_device *dev, instdone[1] = I915_READ(INSTDONE1); break; default: -// WARN_ONCE(1, "Unsupported platform\n"); + WARN_ONCE(1, "Unsupported platform\n"); case 7: instdone[0] = I915_READ(GEN7_INSTDONE_1); instdone[1] = I915_READ(GEN7_SC_INSTDONE); diff --git a/sys/dev/pci/drm/i915/intel_display.c b/sys/dev/pci/drm/i915/intel_display.c index d247e7ffaef..470d1500ad3 100644 --- a/sys/dev/pci/drm/i915/intel_display.c +++ b/sys/dev/pci/drm/i915/intel_display.c @@ -1,4 +1,4 @@ -/* $OpenBSD: intel_display.c,v 1.28 2014/02/02 13:55:31 jsg Exp $ */ +/* $OpenBSD: intel_display.c,v 1.29 2014/02/05 10:58:48 kettenis Exp $ */ /* * Copyright © 2006-2007 Intel Corporation * @@ -7498,9 +7498,7 @@ static int intel_gen7_queue_flip(struct drm_device *dev, plane_bit = MI_DISPLAY_FLIP_IVB_PLANE_C; break; default: -#ifdef notyet WARN_ONCE(1, "unknown plane in flip command\n"); -#endif ret = -ENODEV; goto err_unpin; } |