From 86b6bb11ffc4bce5886b5bc28b8df41af89f0925 Mon Sep 17 00:00:00 2001
From: Julien Cristau <jcristau@debian.org>
Date: Mon, 25 Feb 2008 11:52:20 +0100
Subject: Bug#11761: Fix xaa initialization

Load the xaa module when NoAccel is unset, so it actually has a chance
to work.
---
 src/newport_driver.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/newport_driver.c b/src/newport_driver.c
index 4794df1..0bf0fe1 100644
--- a/src/newport_driver.c
+++ b/src/newport_driver.c
@@ -593,12 +593,15 @@ NewportScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
 	pNewport->NoAccel = FALSE;
 	if (xf86ReturnOptValBool(pNewport->Options, OPTION_NOACCEL, FALSE)) 
 	{
-	    if (!xf86LoadSubModule(pScrn, "xaa"))
-		return FALSE;
-	    xf86LoaderReqSymLists(xaaSymbols, NULL);
 	    pNewport->NoAccel = TRUE;
 	    xf86DrvMsg(pScrn->scrnIndex, X_CONFIG, "Acceleration disabled\n");
 	}
+	if (!pNewport->NoAccel) {
+	    if (!xf86LoadSubModule(pScrn, "xaa"))
+		pNewport->NoAccel = TRUE;
+	    else
+		xf86LoaderReqSymLists(xaaSymbols, NULL);
+	}
 #if 0    
 	if (pScrn->bitsPerPixel < 24)
 	{ /* not implemented yet */
-- 
cgit v1.2.3