diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
index e7bf6cab..2d806fb8 100644
--- a/src/sna/sna_display.c
+++ b/src/sna/sna_display.c
@@ -8838,7 +8838,7 @@ sna_crtc_redisplay(xf86CrtcPtr crtc, RegionPtr region, struct kgem_bo *bo)
 	     region->extents.x2, region->extents.y2,
 	     region_num_rects(region)));
 
-	assert(!wedged(sna));
+	/* assert(!wedged(sna)); */
 
 	if (priv->clear) {
 		RegionRec whole;
diff --git a/src/sna/sna_dri2.c b/src/sna/sna_dri2.c
index 2d822369..9cddb57f 100644
--- a/src/sna/sna_dri2.c
+++ b/src/sna/sna_dri2.c
@@ -1303,7 +1303,7 @@ __sna_dri2_copy_region(struct sna *sna, DrawablePtr draw, RegionPtr region,
 		assert(region == NULL || region == &clip);
 		priv = sna_pixmap_move_area_to_gpu(pixmap, &clip.extents, hint);
 		if (priv) {
-			damage(pixmap, priv, region);
+			damage(pixmap, priv, region ?: &clip);
 			dst_bo = priv->gpu_bo;
 		}
 		DBG(("%s: updated FrontLeft dst_bo from handle=%d to handle=%d\n",