From 8b4cf24f1403bf3d929cc0725de66b3d0e08ebaf Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Fri, 20 Jul 2012 14:46:32 +0100 Subject: [PATCH] sna: Also check whether the first upload box can use the BLT No point checking boxes 1..n if box 0 is the troublemaker! Signed-off-by: Chris Wilson --- src/sna/sna_io.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/sna/sna_io.c b/src/sna/sna_io.c index b53143f3..733e542c 100644 --- a/src/sna/sna_io.c +++ b/src/sna/sna_io.c @@ -170,7 +170,8 @@ fallback: return; } - can_blt = kgem_bo_can_blt(kgem, src_bo); + can_blt = kgem_bo_can_blt(kgem, src_bo) && + (box[0].x2 - box[0].x1) * dst->drawable.bitsPerPixel < 8 * (MAXSHORT - 4); extents = box[0]; for (n = 1; n < nbox; n++) { if (box[n].x1 < extents.x1) @@ -575,7 +576,8 @@ fallback: box, nbox); } - can_blt = kgem_bo_can_blt(kgem, dst_bo); + can_blt = kgem_bo_can_blt(kgem, dst_bo) && + (box[0].x2 - box[0].x1) * dst->drawable.bitsPerPixel < 8 * (MAXSHORT - 4); extents = box[0]; for (n = 1; n < nbox; n++) { if (box[n].x1 < extents.x1)