From 144d97046156a3f7785f98c4f7dbed3fd8f5b7af Mon Sep 17 00:00:00 2001
From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Mon, 9 Sep 2013 15:34:41 +0100
Subject: [PATCH] sna/gen6+: Only apply the BLT copy w/a for self-copies

A missing check along the copy_boxes() path to bring the w/a into line
with the other paths.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 src/sna/sna_blt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index af4a92ad..94d84589 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -3000,7 +3000,7 @@ bool sna_blt_copy_boxes(struct sna *sna, uint8_t alu,
 
 	if (kgem->nexec > 1 && __kgem_ring_empty(kgem)) {
 		_kgem_submit(kgem);
-	} else if (kgem->gen >= 060 && kgem_check_batch(kgem, 3)) {
+	} else if (kgem->gen >= 060 && src_bo == dst_bo && kgem_check_batch(kgem, 3)) {
 		uint32_t *b = kgem->batch + kgem->nbatch;
 		b[0] = XY_SETUP_CLIP;
 		b[1] = b[2] = 0;