From bc7a6b9bc66afe4adf7c232c94e41694319d4155 Mon Sep 17 00:00:00 2001
From: Jay Sorg <jay.sorg@gmail.com>
Date: Thu, 9 Oct 2014 19:42:29 -0700
Subject: Xorg: simd changes

---
 xorg/server/module/Makefile                           | 2 ++
 xorg/server/module/amd64/i420_to_rgb32_amd64_sse2.asm | 6 +++---
 xorg/server/module/amd64/yv12_to_rgb32_amd64_sse2.asm | 6 +++---
 xorg/server/module/rdpSimd.c                          | 8 ++++++++
 xorg/server/module/rdpXv.c                            | 8 --------
 xorg/server/module/x86/i420_to_rgb32_x86_sse2.asm     | 6 +++---
 xorg/server/module/x86/yv12_to_rgb32_x86_sse2.asm     | 6 +++---
 7 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/xorg/server/module/Makefile b/xorg/server/module/Makefile
index 8036400b..8f1560d6 100644
--- a/xorg/server/module/Makefile
+++ b/xorg/server/module/Makefile
@@ -14,6 +14,8 @@ rdpTrapezoids.o rdpXv.o rdpSimd.o
 CFLAGS = -g -O2 -Wall -fPIC -I/usr/include/xorg -I/usr/include/pixman-1 \
 -I../../../common
 
+;CFLAGS += -DSIMD_USE_ACCEL=1
+
 LDFLAGS =
 
 LIBS =
diff --git a/xorg/server/module/amd64/i420_to_rgb32_amd64_sse2.asm b/xorg/server/module/amd64/i420_to_rgb32_amd64_sse2.asm
index b419e714..d9760caa 100644
--- a/xorg/server/module/amd64/i420_to_rgb32_amd64_sse2.asm
+++ b/xorg/server/module/amd64/i420_to_rgb32_amd64_sse2.asm
@@ -175,9 +175,9 @@ loop_y:
     ; save rdx
     mov [rsp + 48], rdx
 
-    prefetchnta 4096[rsp + 0]  ; y
-    prefetchnta 1024[rsp + 16] ; u
-    prefetchnta 1024[rsp + 24] ; v
+    ;prefetchnta 4096[rsp + 0]  ; y
+    ;prefetchnta 1024[rsp + 16] ; u
+    ;prefetchnta 1024[rsp + 24] ; v
 
 loop_x:
 
diff --git a/xorg/server/module/amd64/yv12_to_rgb32_amd64_sse2.asm b/xorg/server/module/amd64/yv12_to_rgb32_amd64_sse2.asm
index 5922ab7c..13e46878 100644
--- a/xorg/server/module/amd64/yv12_to_rgb32_amd64_sse2.asm
+++ b/xorg/server/module/amd64/yv12_to_rgb32_amd64_sse2.asm
@@ -175,9 +175,9 @@ loop_y:
     ; save rdx
     mov [rsp + 48], rdx
 
-    prefetchnta 4096[rsp + 0]  ; y
-    prefetchnta 1024[rsp + 16] ; u
-    prefetchnta 1024[rsp + 24] ; v
+    ;prefetchnta 4096[rsp + 0]  ; y
+    ;prefetchnta 1024[rsp + 16] ; u
+    ;prefetchnta 1024[rsp + 24] ; v
 
 loop_x:
 
diff --git a/xorg/server/module/rdpSimd.c b/xorg/server/module/rdpSimd.c
index 098b71f3..7215bf86 100644
--- a/xorg/server/module/rdpSimd.c
+++ b/xorg/server/module/rdpSimd.c
@@ -44,6 +44,14 @@ int g_simd_use_accel = 1;
 #define SIMD_USE_ACCEL 0
 #endif
 
+#if SIMD_USE_ACCEL
+#if defined(__x86_64__) || defined(__AMD64__) || defined (_M_AMD64)
+#include "amd64/funcs_amd64.h"
+#elif defined(__x86__) || defined(_M_IX86) || defined(__i386__)
+#include "x86/funcs_x86.h"
+#endif
+#endif
+
 #define LOG_LEVEL 1
 #define LLOGLN(_level, _args) \
     do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
diff --git a/xorg/server/module/rdpXv.c b/xorg/server/module/rdpXv.c
index 3a6fadf6..1557f892 100644
--- a/xorg/server/module/rdpXv.c
+++ b/xorg/server/module/rdpXv.c
@@ -624,14 +624,6 @@ xrdpVidQueryImageAttributes(ScrnInfoPtr pScrn, int id,
     return size;
 }
 
-#if XV_USE_ACCEL
-#if defined(__x86_64__) || defined(__AMD64__) || defined (_M_AMD64)
-#include "amd64/funcs_amd64.h"
-#elif defined(__x86__) || defined(_M_IX86) || defined(__i386__)
-#include "x86/funcs_x86.h"
-#endif
-#endif
-
 /*****************************************************************************/
 Bool
 rdpXvInit(ScreenPtr pScreen, ScrnInfoPtr pScrn)
diff --git a/xorg/server/module/x86/i420_to_rgb32_x86_sse2.asm b/xorg/server/module/x86/i420_to_rgb32_x86_sse2.asm
index 22927c0e..0c7a6e1e 100644
--- a/xorg/server/module/x86/i420_to_rgb32_x86_sse2.asm
+++ b/xorg/server/module/x86/i420_to_rgb32_x86_sse2.asm
@@ -170,9 +170,9 @@ loop_y:
     ; save edx
     mov [esp + 24], edx
 
-    prefetchnta 4096[esp + 0]  ; y
-    prefetchnta 1024[esp + 8]  ; u
-    prefetchnta 1024[esp + 12] ; v
+    ;prefetchnta 4096[esp + 0]  ; y
+    ;prefetchnta 1024[esp + 8]  ; u
+    ;prefetchnta 1024[esp + 12] ; v
 
 loop_x:
 
diff --git a/xorg/server/module/x86/yv12_to_rgb32_x86_sse2.asm b/xorg/server/module/x86/yv12_to_rgb32_x86_sse2.asm
index 3bd0c59a..d50a65a2 100644
--- a/xorg/server/module/x86/yv12_to_rgb32_x86_sse2.asm
+++ b/xorg/server/module/x86/yv12_to_rgb32_x86_sse2.asm
@@ -170,9 +170,9 @@ loop_y:
     ; save edx
     mov [esp + 24], edx
 
-    prefetchnta 4096[esp + 0]  ; y
-    prefetchnta 1024[esp + 8]  ; u
-    prefetchnta 1024[esp + 12] ; v
+    ;prefetchnta 4096[esp + 0]  ; y
+    ;prefetchnta 1024[esp + 8]  ; u
+    ;prefetchnta 1024[esp + 12] ; v
 
 loop_x:
 
-- 
cgit v1.2.1