xf86-video-intel: 2 commits - src/sna/sna_accel.c src/sna/sna_blt.c

[Chris Wilson]

 src/sna/sna_accel.c |    5 ++++-
 src/sna/sna_blt.c   |    1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit dbfbbcb4b37548172fd6fe9a6976e5ec310477ca
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 2 11:50:40 2015 +0100

    sna: Mark GPU as wholly damage when replacing a drawable
    
    References: https://bugs.freedesktop.org/show_bug.cgi?id=90725#c37
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index 09f78c8..17b6ec9 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -3796,8 +3796,11 @@ create_gpu_bo:
 				else
 					move = MOVE_WRITE | MOVE_READ | MOVE_ASYNC_HINT;
 
-				if (sna_pixmap_move_to_gpu(pixmap, move))
+				if (sna_pixmap_move_to_gpu(pixmap, move)) {
+					sna_damage_all(&priv->gpu_damage,
+						       pixmap);
 					goto use_gpu_bo;
+				}
 			}
 
 			if (DAMAGE_IS_ALL(priv->gpu_damage) ||
commit c692691029a42749c5567613bf8a3607968e1fa5
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jun 2 11:42:08 2015 +0100

    sna: Ensure damage is set to full when marking as clear
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 38167ff..ff2bdc8 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -1203,6 +1203,7 @@ static inline void _sna_blt_maybe_clear(const struct sna_composite_op *op, const
 	    box->y2 - box->y1 >= op->dst.height) {
 		struct sna_pixmap *priv = sna_pixmap(op->dst.pixmap);
 		if (op->dst.bo == priv->gpu_bo) {
+			sna_damage_all(&priv->gpu_damage, op->dst.pixmap);
 			priv->clear = true;
 			priv->clear_color = op->u.blt.pixel;
 			DBG(("%s: pixmap=%ld marking clear [%08x]\n",