xf86-video-r128: Branch 'master' - 2 commits

[Adam Jackson]

 src/r128_accel.c  |    3 +++
 src/r128_driver.c |   24 ++++++++----------------
 2 files changed, 11 insertions(+), 16 deletions(-)

New commits:
commit b4892e34011d6da577002a29913a803d5dbe1c06
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 17:07:11 2011 -0500

    Fix for new vgahw ABI
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/r128_driver.c b/src/r128_driver.c
index f5b3abf..4887727 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -2002,8 +2002,10 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
     } else
            xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAAccess option set to FALSE,"
                       " VGA module load skipped\n");
-    if (info->VGAAccess)
+    if (info->VGAAccess) {
+	vgaHWSetStdFuncs(VGAHWPTR(pScrn));
         vgaHWGetIOBase(VGAHWPTR(pScrn));
+    }
 #else
     xf86DrvMsg(pScrn->scrnIndex, X_INFO, "VGAHW support not compiled, VGA "
                "module load skipped\n");
commit 4ad32624b2f1344168e0083d33227021c87fee60
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 17:06:11 2011 -0500

    Make failure to XAA non-fatal
    
    No shadowfb support in this driver yet
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/r128_accel.c b/src/r128_accel.c
index eeb2bfc..e383cfa 100644
--- a/src/r128_accel.c
+++ b/src/r128_accel.c
@@ -1866,6 +1866,9 @@ Bool R128AccelInit(ScreenPtr pScreen)
     R128InfoPtr   info  = R128PTR(pScrn);
     XAAInfoRecPtr a;
 
+    if (!xf86LoadSubModule(pScrn, "xaa"))
+	return FALSE;
+
     if (!(a = info->accel = XAACreateInfoRec())) return FALSE;
 
 #ifdef XF86DRI
diff --git a/src/r128_driver.c b/src/r128_driver.c
index eb1d978..f5b3abf 100644
--- a/src/r128_driver.c
+++ b/src/r128_driver.c
@@ -1753,17 +1753,6 @@ static Bool R128PreInitCursor(ScrnInfoPtr pScrn)
     return TRUE;
 }
 
-/* This is called by R128PreInit to initialize hardware acceleration. */
-static Bool R128PreInitAccel(ScrnInfoPtr pScrn)
-{
-    R128InfoPtr   info = R128PTR(pScrn);
-
-    if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
-	if (!xf86LoadSubModule(pScrn, "xaa")) return FALSE;
-    }
-    return TRUE;
-}
-
 static Bool R128PreInitInt10(ScrnInfoPtr pScrn, xf86Int10InfoPtr *ppInt10)
 {
     R128InfoPtr   info = R128PTR(pScrn);
@@ -2074,8 +2063,6 @@ Bool R128PreInit(ScrnInfoPtr pScrn, int flags)
 
     if (!R128PreInitCursor(pScrn))             goto fail;
 
-    if (!R128PreInitAccel(pScrn))              goto fail;
-
 #ifdef XF86DRI
     if (!R128PreInitDRI(pScrn))                goto fail;
 #endif
@@ -2204,6 +2191,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
     R128InfoPtr info   = R128PTR(pScrn);
     BoxRec      MemBox;
     int		y2;
+    Bool	noAccel;
 
     R128TRACE(("R128ScreenInit %x %d\n", pScrn->memPhysBase, pScrn->fbOffset));
 
@@ -2243,6 +2231,8 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
 			  pScrn->defaultVisual)) return FALSE;
     miSetPixmapDepths ();
 
+    noAccel = xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE);
+
 #ifdef XF86DRI
 				/* Setup DRI after visuals have been
 				   established, but before fbScreenInit is
@@ -2257,7 +2247,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
 			   info->CurrentLayout.pixel_bytes);
 	int maxy        = info->FbMapSize / width_bytes;
 
-	if (xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
+	if (noAccel) {
 	    xf86DrvMsg(scrnIndex, X_WARNING,
 		       "Acceleration disabled, not initializing the DRI\n");
 	    info->directRenderingEnabled = FALSE;
@@ -2541,7 +2531,7 @@ Bool R128ScreenInit(int scrnIndex, ScreenPtr pScreen,
     }
 
 				/* Acceleration setup */
-    if (!xf86ReturnOptValBool(info->Options, OPTION_NOACCEL, FALSE)) {
+    if (!noAccel) {
 	if (R128AccelInit(pScreen)) {
 	    xf86DrvMsg(scrnIndex, X_INFO, "Acceleration enabled\n");
 	    info->accelOn = TRUE;