From: Chris Wilson <chris@chris-wilson.co.uk>
Date: Wed, 6 Nov 2013 09:40:56 +0000 (+0000)
Subject: sna: Move initialisation of loop counter to common code
X-Git-Tag: 2.99.906~28
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c3d5b1d8fcb1b65c35827d38bf5b309e433d0907;p=platform%2Fupstream%2Fxf86-video-intel.git

sna: Move initialisation of loop counter to common code

It was only being defined in x86-64 and left unitialized for x86-32.

Fixes regression from
commit 587c4866652e40e1e228b333028114766a6d3b08
Author: Chris Wilson <chris@chris-wilson.co.uk>
Date:   Mon Nov 4 15:10:40 2013 +0000

    sna: Promote uint16_t to a full int to avoid overflow in computing w*h in memcpy_xor

Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71286
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---

diff --git a/src/sna/blt.c b/src/sna/blt.c
index 4843a41..f861f65 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -1000,13 +1000,13 @@ memcpy_xor(const void *src, void *dst, int bpp,
 				or |= or << 16;
 			}
 		case 4:
-#if USE_SSE2
 			w = width;
 			if (w * 4 == dst_stride && dst_stride == src_stride) {
 				w *= height;
 				height = 1;
 			}
 
+#if USE_SSE2
 			if (have_sse2()) {
 				do {
 					uint32_t *d = (uint32_t *)dst_bytes;