diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index 80a117cf..624c579c 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -4764,6 +4764,8 @@ void sna_mode_update(struct sna *sna)
 	if (sna->flags & SNA_IS_HOSTED)
 		return;
 
+	DBG(("%s\n", __FUNCTION__));
+
 	/* Validate CRTC attachments and force consistency upon the kernel */
 	sna->mode.front_active = 0;
 	for (i = 0; i < config->num_crtc; i++) {
@@ -4822,6 +4824,8 @@ void sna_mode_reset(struct sna *sna)
 	if (sna->flags & SNA_IS_HOSTED)
 		return;
 
+	DBG(("%s\n", __FUNCTION__));
+
 	sna_hide_cursors(sna->scrn);
 
 	for (i = 0; i < config->num_crtc; i++) {
@@ -5334,7 +5338,7 @@ disable1:
 				continue;
 
 			assert(config->crtc[i]->enabled);
-			assert(crtc->dpms_mode == DPMSModeOn);
+			assert(crtc->dpms_mode <= DPMSModeOn);
 
 			arg.crtc_id = crtc->id;
 			arg.fb_id = get_fb(sna, new,
diff --git a/src/sna/sna_dri.c b/src/sna/sna_dri.c
index 5aa4e987..dc1ceaad 100644
--- a/src/sna/sna_dri.c
+++ b/src/sna/sna_dri.c
@@ -2345,6 +2345,7 @@ sna_dri_schedule_wait_msc(ClientPtr client, DrawablePtr draw, CARD64 target_msc,
 	if (sna_wait_vblank(sna, &vbl))
 		goto out_free_info;
 
+	DBG(("%s: waiting until MSC=%llu\n", __FUNCTION__, (long long)vbl.request.sequence));
 	DRI2BlockClient(client, draw);
 	return TRUE;