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

[Chris Wilson]

 src/sna/blt.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8d3c8a6c0d48883ec399f8dd36df0eca200722f9
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Wed Apr 6 19:43:41 2016 +0100

    sna: Restrict sse2 routines to __x86_64__
    
    After fixing the 32bit build (sigh), testing out the manual unwinding of
    the sse2 memcpy doesn't look worthwhile (at least on pnv). So leave it
    off for 32bit builds.
    
    Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

diff --git a/src/sna/blt.c b/src/sna/blt.c
index f247d65..fc84113 100644
--- a/src/sna/blt.c
+++ b/src/sna/blt.c
@@ -339,7 +339,7 @@ memcpy_from_tiled_x__swizzle_0(const void *src, void *dst, int bpp,
 	}
 }
 
-#if defined(sse2) || defined(__x86_64__)
+#if defined(sse2) && defined(__x86_64__)
 
 sse2 static force_inline void
 memcpy_sse64xN(uint8_t *dst, const uint8_t *src, int bytes)
@@ -830,7 +830,7 @@ void choose_memcpy_tiled_x(struct kgem *kgem, int swizzling, unsigned cpu)
 		break;
 	case I915_BIT_6_SWIZZLE_NONE:
 		DBG(("%s: no swizzling\n", __FUNCTION__));
-#if defined(sse2) || defined(__x86_64__)
+#if defined(sse2) && defined(__x86_64__)
 		if (cpu & SSE2) {
 			kgem->memcpy_to_tiled_x = memcpy_to_tiled_x__swizzle_0__sse2;
 			kgem->memcpy_from_tiled_x = memcpy_from_tiled_x__swizzle_0__sse2;