xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 51a0559b120dd0a57a938b300bccefbf1142e495
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Jun 18 20:55:02 2014 +0100

    sna: Do not treat both src/dst having no clones as being the same
    
    Fixes regression from
    commit 62aaf2ff4f8597067cf387865707baa00ed9a123
    Author: Chris Wilson <chris at chris-wilson.co.uk>
    Date:   Wed Jun 18 18:41:15 2014 +0100
    
        sna: Skip redundant copies when already cloned
    
    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 c021652..80d6787 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -6120,7 +6120,9 @@ sna_copy_boxes(DrawablePtr src, DrawablePtr dst, GCPtr gc,
 		goto fallback;
 	}
 
-	if (src_priv && COW(src_priv->cow) == COW(dst_priv->cow) && alu == GXcopy) {
+	if (alu == GXcopy &&
+	    src_priv && src_priv->cow &&
+	    COW(src_priv->cow) == COW(dst_priv->cow)) {
 		if ((dx | dy) == 0) {
 			DBG(("%s: ignoring cow for no op\n",
 			     __FUNCTION__));