From 8a303f195b53a78dcbb2b6c84e7e691bedc86d25 Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 14 Mar 2012 11:26:03 +0000
Subject: [PATCH] sna: Remove existing damage before overwriting with a
 composite op

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_composite.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/sna/sna_composite.c b/src/sna/sna_composite.c
index a610e7cd..b098fcc9 100644
--- a/src/sna/sna_composite.c
+++ b/src/sna/sna_composite.c
@@ -479,6 +479,11 @@ sna_composite(CARD8 op,
 	     get_drawable_dx(dst->pDrawable),
 	     get_drawable_dy(dst->pDrawable)));
 
+	if (op <= PictOpSrc) {
+		struct sna_pixmap *priv = sna_pixmap_from_drawable(dst->pDrawable);
+		sna_damage_subtract(&priv->cpu_damage, &region);
+	}
+
 	memset(&tmp, 0, sizeof(tmp));
 	if (!sna->render.composite(sna,
 				   op, src, mask, dst,