Index: dev/drm/i915_dma.c
===================================================================
--- dev/drm/i915_dma.c	(revision 190402)
+++ dev/drm/i915_dma.c	(working copy)
@@ -444,6 +444,8 @@
 	if (dev_priv->sarea_priv)
 		dev_priv->sarea_priv->last_enqueue = dev_priv->counter;
 
+	DRM_DEBUG("emitting: %d\n", dev_priv->counter);
+
 	BEGIN_LP_RING(4);
 	OUT_RING(MI_STORE_DWORD_INDEX);
 	OUT_RING(I915_BREADCRUMB_INDEX << MI_STORE_DWORD_INDEX_SHIFT);
@@ -481,6 +483,7 @@
 	}
 
 	i915_emit_breadcrumb(dev);
+
 	return 0;
 }
 
Index: dev/drm/i915_drv.c
===================================================================
--- dev/drm/i915_drv.c	(revision 190402)
+++ dev/drm/i915_drv.c	(working copy)
@@ -52,7 +52,10 @@
 		return -ENODEV;
 	}
 
+	DRM_LOCK();
+	DRM_DEBUG("starting suspend\n");
 	i915_save_state(dev);
+	DRM_UNLOCK();
 
 	return (bus_generic_suspend(kdev));
 }
@@ -61,7 +64,10 @@
 {
 	struct drm_device *dev = device_get_softc(kdev);
 
+	DRM_LOCK();
+	DRM_DEBUG("starting resume\n");
 	i915_restore_state(dev);
+	DRM_UNLOCK();
 
 	return (bus_generic_resume(kdev));
 }
Index: dev/drm/i915_irq.c
===================================================================
--- dev/drm/i915_irq.c	(revision 190402)
+++ dev/drm/i915_irq.c	(working copy)
@@ -205,7 +205,7 @@
 	iir = I915_READ(IIR);
 
 	if (IS_I965G(dev)) {
-		vblank_status = I915_START_VBLANK_INTERRUPT_STATUS;
+		vblank_status = PIPE_START_VBLANK_INTERRUPT_STATUS;
 		vblank_enable = PIPE_START_VBLANK_INTERRUPT_ENABLE;
 	} else {
 		vblank_status = I915_VBLANK_INTERRUPT_STATUS;
@@ -343,6 +343,9 @@
 
 	DRM_DEBUG("irq_nr=%d breadcrumb=%d\n", irq_nr,
 		  READ_BREADCRUMB(dev_priv));
+	DRM_DEBUG("ier: %08x, imr: %08x, pipeastat: %08x, pipebstat: %08x\n",
+	    I915_READ(IER), I915_READ(IER),
+	    I915_READ(PIPEASTAT), I915_READ(PIPEBSTAT));
 
 	i915_user_irq_get(dev);
 	DRM_WAIT_ON(ret, dev_priv->irq_queue, 3 * DRM_HZ,
@@ -408,11 +411,8 @@
 int i915_enable_vblank(struct drm_device *dev, int pipe)
 {
 	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;
-	int pipeconf_reg = (pipe == 0) ? PIPEACONF : PIPEBCONF;
-	u32 pipeconf;
 
-	pipeconf = I915_READ(pipeconf_reg);
-	if (!(pipeconf & PIPEACONF_ENABLE))
+	if (!i915_pipe_enabled(dev, pipe))
 		return -EINVAL;
 
 	DRM_SPINLOCK(&dev_priv->user_irq_lock);
Index: dev/drm/drm_irq.c
===================================================================
--- dev/drm/drm_irq.c	(revision 190433)
+++ dev/drm/drm_irq.c	(working copy)
@@ -345,13 +345,11 @@
 	struct drm_modeset_ctl *modeset = data;
 	int crtc, ret = 0;
 
-	DRM_DEBUG("num_crtcs=%d\n", dev->num_crtcs);
 	/* If drm_vblank_init() hasn't been called yet, just no-op */
 	if (!dev->num_crtcs)
 		goto out;
 
 	crtc = modeset->crtc;
-	DRM_DEBUG("crtc=%d\n", crtc);
 	if (crtc >= dev->num_crtcs) {
 		ret = EINVAL;
 		goto out;
@@ -366,7 +364,7 @@
 	 */
 	switch (modeset->cmd) {
 	case _DRM_PRE_MODESET:
-		DRM_DEBUG("pre-modeset\n");
+		DRM_DEBUG("pre-modeset, crtc %d\n", crtc);
 		if (!dev->vblank[crtc].inmodeset) {
 			dev->vblank[crtc].inmodeset = 0x1;
 			if (drm_vblank_get(dev, crtc) == 0)
@@ -374,7 +372,7 @@
 		}
 		break;
 	case _DRM_POST_MODESET:
-		DRM_DEBUG("post-modeset\n");
+		DRM_DEBUG("post-modeset, crtc %d\n", crtc);
 		if (dev->vblank[crtc].inmodeset) {
 			DRM_SPINLOCK(&dev->vbl_lock);
 			dev->vblank_disable_allowed = 1;
@@ -477,6 +475,9 @@
 			mtx_unlock(&dev->irq_lock);
 		}
 
+		if (ret == EWOULDBLOCK)
+			DRM_ERROR("timed out waiting on vblank\n");
+
 		if (ret != EINTR && ret != ERESTART) {
 			struct timeval now;
 
Index: dev/drm/drm_sysctl.c
===================================================================
--- dev/drm/drm_sysctl.c	(revision 190402)
+++ dev/drm/drm_sysctl.c	(working copy)
@@ -38,6 +38,7 @@
 static int	   drm_vm_info DRM_SYSCTL_HANDLER_ARGS;
 static int	   drm_clients_info DRM_SYSCTL_HANDLER_ARGS;
 static int	   drm_bufs_info DRM_SYSCTL_HANDLER_ARGS;
+static int	   drm_vblank_info DRM_SYSCTL_HANDLER_ARGS;
 
 struct drm_sysctl_list {
 	const char *name;
@@ -47,6 +48,7 @@
 	{"vm",	    drm_vm_info},
 	{"clients", drm_clients_info},
 	{"bufs",    drm_bufs_info},
+	{"vblank",    drm_vblank_info},
 };
 #define DRM_SYSCTL_ENTRIES (sizeof(drm_sysctl_list)/sizeof(drm_sysctl_list[0]))
 
@@ -313,3 +315,25 @@
 	free(tempprivs, DRM_MEM_DRIVER);
 	return retcode;
 }
+
+static int drm_vblank_info DRM_SYSCTL_HANDLER_ARGS
+{
+	struct drm_device *dev = arg1;
+	char buf[128];
+	int retcode;
+	int i;
+
+	DRM_SYSCTL_PRINT("\ncrtc ref count    last     enabled inmodeset\n");
+	for(i = 0 ; i < dev->num_crtcs ; i++) {
+		DRM_SYSCTL_PRINT("  %02d  %02d %08d %08d %02d      %02d\n",
+		    i, atomic_read(&dev->vblank[i].refcount),
+		    atomic_read(&dev->vblank[i].count),
+		    atomic_read(&dev->vblank[i].last),
+		    atomic_read(&dev->vblank[i].enabled),
+		    atomic_read(&dev->vblank[i].inmodeset));
+	}
+
+	SYSCTL_OUT(req, "", -1);
+done:
+	return retcode;
+}