xserver: Branch 'master' - 2 commits

[Søren Sandmann Pedersen]

 fb/fbpict.c |   17 -----------------
 1 files changed, 17 deletions(-)

New commits:
diff-tree 876b806ec09d5ff0c6cd19df91006c4eefedfaa6 (from 13568d2aa43da4216bbcb46e1125ff28c323ac54)
Author: Soren Sandmann Pedersen <ssp at dhcp83-218.boston.redhat.com>
Date:   Tue Feb 6 17:16:23 2007 -0500

    Reapply patch to fix AMD CPU detection

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 28503c0..3ff609f 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -1516,7 +1516,9 @@ static unsigned int detectCPUFeatures(vo
             features |= SSE;
         if (result & (1 << 26))
             features |= SSE2;
-        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
+        if ((features & MMX) && !(features & SSE) &&
+            (strcmp(vendor, "AuthenticAMD") == 0 ||
+             strcmp(vendor, "Geode by NSC") == 0)) {
             /* check for AMD MMX extensions */
 
             unsigned int result;            
diff-tree 13568d2aa43da4216bbcb46e1125ff28c323ac54 (from 5a3334410367a2186b2c667fa1eb6cf0baf93e95)
Author: Soren Sandmann Pedersen <ssp at dhcp83-218.boston.redhat.com>
Date:   Tue Feb 6 17:12:01 2007 -0500

    Revert "Fix for AMD cpu detection. Bug 9614, Dan Williams."
    
    This reverts commit b2cd3b133748cc5aa541905a703a6fdb1cbbb1e6 since
    unrelated changes in fbpict.c broke the build.

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 39d8d9f..28503c0 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -189,23 +189,6 @@ fbCompositeSolidMask_nx8888x8888C (CARD8
     fbComposeGetStart (pDst, xDst, yDst, CARD32, dstStride, dstLine, 1);
     fbComposeGetStart (pMask, xMask, yMask, CARD32, maskStride, maskLine, 1);
 
-    {
-	comp_image_t src, msk, dst;
-	comp_pixel_t src_pixel;
-	comp_format_t msk_format = { 0xff000000, 0x00ff0000, 0x0000ff00, 0x000000ff };
-	
-	src_pixel.red   = src & 0x000000ff;
-	src_pixel.green = src & 0x0000ff00;
-	src_pixel.blue  = src & 0x00ff0000;
-	src_pixel.alpha = src & 0xff000000;
-	
-	comp_image_init_solid (&src, &src_pixel);
-	comp_image_init_bits  (&msk, maskLine, maskStride, &msk_format);
-	comp_image_init_bits  (&dst, dstLine, dstStride, &dst_format);
-
-	comp_over_c (src, msk, dst, srcX, srcY, mskX, mskY, dstX, dstY);
-    }
-    
     while (height--)
     {
 	dst = dstLine;
@@ -1533,9 +1516,7 @@ static unsigned int detectCPUFeatures(vo
             features |= SSE;
         if (result & (1 << 26))
             features |= SSE2;
-        if ((features & MMX) && !(features & SSE) &&
-            (strcmp(vendor, "AuthenticAMD") == 0 ||
-             strcmp(vendor, "Geode by NSC") == 0)) {
+        if ((result & MMX) && !(result & SSE) && (strcmp(vendor, "AuthenticAMD") == 0)) {
             /* check for AMD MMX extensions */
 
             unsigned int result;