xserver: Branch 'master'

[Aaron Plattner]

 hw/xfree86/xaa/xaaCpyPlane.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 25882af6d3359e5ae42c927c555f5b257ba5665c
Author: Ivaylo Boyadzhiev <iboyadzhiev at nvidia.com>
Date:   Sun Aug 3 18:55:12 2008 -0700

    Fix a longstanding XAA CopyPlane bug.
    
    TmpBitPlane is a plane mask, not a plane index.
    
    Signed-off-by: Aaron Plattner <aplattner at nvidia.com>

diff --git a/hw/xfree86/xaa/xaaCpyPlane.c b/hw/xfree86/xaa/xaaCpyPlane.c
index cd9e9d4..a0ebb75 100644
--- a/hw/xfree86/xaa/xaaCpyPlane.c
+++ b/hw/xfree86/xaa/xaaCpyPlane.c
@@ -110,12 +110,12 @@ XAACopyPlaneNtoNColorExpand(
     int Bpp = pSrc->bitsPerPixel >> 3;
     unsigned long mask = TmpBitPlane;
 
-    if(TmpBitPlane < 8) {
+    if(TmpBitPlane < (1 << 8)) {
 	offset = 0;
-    } else if(TmpBitPlane < 16) {
+    } else if(TmpBitPlane < (1 << 16)) {
 	offset = 1;
 	mask >>= 8;
-    } else if(TmpBitPlane < 24) {
+    } else if(TmpBitPlane < (1 << 24)) {
 	offset = 2;
 	mask >>= 16;
     } else {