diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index be2713f12e08..05dbc3bd7a7b 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -2542,6 +2542,7 @@ semaphore_waits_for(struct intel_ring_buffer *ring, u32 *seqno)
 	acthd = intel_ring_get_active_head(ring) & HEAD_ADDR;
 	acthd_min = max((int)acthd - 3 * 4, 0);
 	do {
+		/* This here seems to blow up */
 		cmd = ioread32(ring->virtual_start + acthd);
 		if (cmd == ipehr)
 			break;
@@ -2611,6 +2612,7 @@ ring_stuck(struct intel_ring_buffer *ring, u32 acthd)
 		return HANGCHECK_KICK;
 	}
 
+#if 0
 	if (INTEL_INFO(dev)->gen >= 6 && tmp & RING_WAIT_SEMAPHORE) {
 		switch (semaphore_passed(ring)) {
 		default:
@@ -2625,6 +2627,7 @@ ring_stuck(struct intel_ring_buffer *ring, u32 acthd)
 			return HANGCHECK_WAIT;
 		}
 	}
+#endif
 
 	return HANGCHECK_HUNG;
 }