Should be safe to allow intel_ring_wait_seqno() to be interrupted.

Reduces diffs with Linux.

1 files changed, 1 insertions, 13 deletions

diff --git a/sys/dev/pci/drm/i915/intel_ringbuffer.c b/sys/dev/pci/drm/i915/intel_ringbuffer.c
index c8d9736503c..8e51efee8c0 100644
--- a/sys/dev/pci/drm/i915/intel_ringbuffer.c
+++ b/sys/dev/pci/drm/i915/intel_ringbuffer.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: intel_ringbuffer.c,v 1.9 2013/11/20 22:10:19 kettenis Exp $	*/
+/*	$OpenBSD: intel_ringbuffer.c,v 1.10 2013/11/29 21:44:15 kettenis Exp $	*/
 /*
  * Copyright © 2008-2010 Intel Corporation
  *
@@ -1274,24 +1274,12 @@ void intel_cleanup_ring_buffer(struct intel_ring_buffer *ring)
 
 static int intel_ring_wait_seqno(struct intel_ring_buffer *ring, u32 seqno)
 {
-	drm_i915_private_t *dev_priv = ring->dev->dev_private;
-	bool was_interruptible;
 	int ret;
 
-	/* XXX As we have not yet audited all the paths to check that
-	 * they are ready for ERESTARTSYS from intel_ring_begin, do not
-	 * allow us to be interruptible by a signal.
-	 */
-	was_interruptible = dev_priv->mm.interruptible;
-	dev_priv->mm.interruptible = false;
-
 	ret = i915_wait_seqno(ring, seqno);
-
 	if (!ret)
 		i915_gem_retire_requests_ring(ring);
 
-	dev_priv->mm.interruptible = was_interruptible;
-
 	return ret;
 }