summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2012-06-04 15:39:39 +0100
committerChris Wilson <chris@chris-wilson.co.uk>2012-06-04 15:48:55 +0100
commit1f43de322b400dcd64eb4545a978ad9b1c7de185 (patch)
treefe214b10ee2b86030534a1feaf2a5ca82a195eb3
parentebb1c9d5f82e8822f7400ff11a887ab047a0d78e (diff)
sna: Exclude consideration of tiling flags from overwriting BLT commands
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
-rw-r--r--src/sna/sna_blt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_blt.c b/src/sna/sna_blt.c
index 82c61df6..e84c87f7 100644
--- a/src/sna/sna_blt.c
+++ b/src/sna/sna_blt.c
@@ -431,7 +431,7 @@ static void sna_blt_copy_one(struct sna *sna,
/* Compare against a previous fill */
if (kgem->nbatch >= 6 &&
blt->overwrites &&
- kgem->batch[kgem->nbatch-6] == ((blt->cmd & ~XY_SRC_COPY_BLT_CMD) | XY_COLOR_BLT) &&
+ kgem->batch[kgem->nbatch-6] == (XY_COLOR_BLT | (blt->cmd & BLT_WRITE_ALPHA | BLT_WRITE_RGB)) &&
kgem->batch[kgem->nbatch-4] == ((uint32_t)dst_y << 16 | (uint16_t)dst_x) &&
kgem->batch[kgem->nbatch-3] == ((uint32_t)(dst_y+height) << 16 | (uint16_t)(dst_x+width)) &&
kgem->reloc[kgem->nreloc-1].target_handle == blt->bo[1]->handle) {