diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 1375a7a3..9d847474 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -579,6 +579,20 @@ pixel_is_opaque(uint32_t pixel, uint32_t format)
 		return FALSE;
 }
 
+static Bool
+pixel_is_white(uint32_t pixel, uint32_t format)
+{
+	switch (PICT_FORMAT_TYPE(format)) {
+	case PICT_TYPE_A:
+	case PICT_TYPE_ARGB:
+	case PICT_TYPE_ABGR:
+	case PICT_TYPE_BGRA:
+		return pixel == ((1 << PICT_FORMAT_BPP(format)) - 1);
+	default:
+		return FALSE;
+	}
+}
+
 static Bool
 is_opaque_solid(PicturePtr picture)
 {
@@ -589,6 +603,16 @@ is_opaque_solid(PicturePtr picture)
 		return pixel_is_opaque(get_pixel(picture), picture->format);
 }
 
+static Bool
+is_white(PicturePtr picture)
+{
+	if (picture->pSourcePict) {
+		PictSolidFill *fill = (PictSolidFill *) picture->pSourcePict;
+		return fill->color == 0xffffffff;
+	} else
+		return pixel_is_white(get_pixel(picture), picture->format);
+}
+
 fastcall
 static void blt_fill_composite(struct sna *sna,
 			       const struct sna_composite_op *op,
@@ -1096,6 +1120,10 @@ sna_blt_composite(struct sna *sna,
 	if (is_solid(src)) {
 		if (op == PictOpOver && is_opaque_solid(src))
 			op = PictOpSrc;
+		if (op == PictOpAdd && is_white(src))
+			op = PictOpSrc;
+		if (op == PictOpOutReverse && is_opaque_solid(src))
+			return prepare_blt_clear(sna, tmp);
 
 		if (op != PictOpSrc) {
 			DBG(("%s: unsuported op [%d] for blitting\n",