xserver: Branch 'master'

[Aaron Plattner]

 hw/xfree86/xaa/xaaInitAccel.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 01879e583b0ce0d8fddc37e36d9b69fe4f1d1e72
Author: Aaron Plattner <aplattner at nvidia.com>
Date:   Tue Feb 3 13:49:19 2009 -0800

    Don't enable XAA offscreen pixmaps with Option "XaaOffscreenPixmaps" "no".
    
    xf86IsOptionSet is rarely the right function to use for boolean options because
    it returns TRUE whenever the option is present, even if its value is "no",
    "off", "0", etc.

diff --git a/hw/xfree86/xaa/xaaInitAccel.c b/hw/xfree86/xaa/xaaInitAccel.c
index 3b397dc..157325e 100644
--- a/hw/xfree86/xaa/xaaInitAccel.c
+++ b/hw/xfree86/xaa/xaaInitAccel.c
@@ -528,7 +528,9 @@ XAAInitAccel(ScreenPtr pScreen, XAAInfoRecPtr infoRec)
 #define XAAMSG(s) do { if (serverGeneration == 1) xf86ErrorF(s); } while (0)
 
     if((infoRec->Flags & OFFSCREEN_PIXMAPS) && HaveScreenToScreenCopy &&
-		xf86IsOptionSet(options, XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE))
+		xf86ReturnOptValBool(options,
+				     XAAOPT_HAS_DUMB_INVERTED_OPTION_SENSE,
+				     FALSE))
     {
 	XAAMSG("\tOffscreen Pixmaps\n");
     } else {