diff --git a/drivers/gpu/drm/i915/intel_ringbuffer.c b/drivers/gpu/drm/i915/intel_ringbuffer.c
index 38ae0ec..a5ba981 100644
--- a/drivers/gpu/drm/i915/intel_ringbuffer.c
+++ b/drivers/gpu/drm/i915/intel_ringbuffer.c
@@ -145,16 +145,43 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 	struct drm_i915_gem_object *obj = ring->obj;
 	u32 head;
 
+	printk("i915: ctl %08x head %08x tail %08x start %08x\n",
+	       I915_READ_CTL(ring),
+	       I915_READ_HEAD(ring),
+	       I915_READ_TAIL(ring),
+	       I915_READ_START(ring));
+
 	/* Stop the ring if it's running. */
 	I915_WRITE_CTL(ring, 0);
+
+	printk("i915: ctl %08x head %08x tail %08x start %08x\n",
+	       I915_READ_CTL(ring),
+	       I915_READ_HEAD(ring),
+	       I915_READ_TAIL(ring),
+	       I915_READ_START(ring));
+
 	I915_WRITE_HEAD(ring, 0);
+
+	printk("i915: ctl %08x head %08x tail %08x start %08x\n",
+	       I915_READ_CTL(ring),
+	       I915_READ_HEAD(ring),
+	       I915_READ_TAIL(ring),
+	       I915_READ_START(ring));
+
 	ring->write_tail(ring, 0);
 
 	head = I915_READ_HEAD(ring) & HEAD_ADDR;
+	printk("i915: head = %08x\n", head);
+
+	printk("i915: ctl %08x head %08x tail %08x start %08x\n",
+	       I915_READ_CTL(ring),
+	       I915_READ_HEAD(ring),
+	       I915_READ_TAIL(ring),
+	       I915_READ_START(ring));
 
 	/* G45 ring initialization fails to reset head to zero */
 	if (head != 0) {
-		DRM_DEBUG_KMS("%s head not reset to zero "
+		DRM_ERROR("%s head not reset to zero "
 			      "ctl %08x head %08x tail %08x start %08x\n",
 			      ring->name,
 			      I915_READ_CTL(ring),
@@ -180,6 +207,17 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 	 * also enforces ordering), otherwise the hw might lose the new ring
 	 * register values. */
 	I915_WRITE_START(ring, obj->gtt_offset);
+	head = I915_READ_HEAD(ring) & HEAD_ADDR;
+	printk("i915: head = %08x\n", head);
+
+	printk("i915: ctl %08x head %08x tail %08x start %08x\n",
+	       I915_READ_CTL(ring),
+	       I915_READ_HEAD(ring),
+	       I915_READ_TAIL(ring),
+	       I915_READ_START(ring));
+	if (wait_for((I915_READ_HEAD(ring) & HEAD_ADDR) == 0, 1000))
+		printk("i915: timeout\n");
+
 	I915_WRITE_CTL(ring,
 			((ring->size - PAGE_SIZE) & RING_NR_PAGES)
 			| RING_REPORT_64K | RING_VALID);
@@ -195,6 +233,7 @@ static int init_ring_common(struct intel_ring_buffer *ring)
 				I915_READ_HEAD(ring),
 				I915_READ_TAIL(ring),
 				I915_READ_START(ring));
+		printk("i915: %08x %08x %08x\n", I915_READ_CTL(ring) & RING_VALID, obj->gtt_offset, I915_READ_HEAD(ring) & HEAD_ADDR);
 		return -EIO;
 	}