fix intel_wrap_ring_buffer, seems to fix gpu hangs on ivb

2 files changed, 1 insertions, 4 deletions

diff --git a/sys/dev/pci/drm/intel_ringbuffer.c b/sys/dev/pci/drm/intel_ringbuffer.c
index bac97527d2c..d914e46293a 100644
--- a/sys/dev/pci/drm/intel_ringbuffer.c
+++ b/sys/dev/pci/drm/intel_ringbuffer.c
@@ -1504,10 +1504,8 @@ intel_wrap_ring_buffer(struct intel_ring_buffer *ring)
 			return ret;
 	}
 
-	ring->space -= rem;
-
 	bus_space_set_region_4(dev_priv->bst, ring->bsh,
-	    ring->woffset, MI_NOOP, rem / 4);
+	    ring->tail, MI_NOOP, rem / 4);
 
 	ring->tail = 0;
 	ring->space = ring_space(ring);
diff --git a/sys/dev/pci/drm/intel_ringbuffer.h b/sys/dev/pci/drm/intel_ringbuffer.h
index 40fb19c567c..e9a6b0810f3 100644
--- a/sys/dev/pci/drm/intel_ringbuffer.h
+++ b/sys/dev/pci/drm/intel_ringbuffer.h
@@ -52,7 +52,6 @@ struct  intel_ring_buffer {
 	struct		drm_i915_gem_object *obj;
 
 	bus_space_handle_t	 bsh;
-	uint32_t		 woffset;
 
 	u32		head;
 	u32		tail;