xf86-video-nv: 2 commits - src/g80_driver.c src/nv_driver.c src/riva_driver.c

[Adam Jackson]

 src/g80_driver.c  |    4 ++--
 src/nv_driver.c   |    7 ++++---
 src/riva_driver.c |    7 ++++---
 3 files changed, 10 insertions(+), 8 deletions(-)

New commits:
commit b3d61828837661c9b383378a7d6006752659108b
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 16:57:40 2011 -0500

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

diff --git a/src/nv_driver.c b/src/nv_driver.c
index 195299a..527ae5f 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -1543,6 +1543,7 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86FreeInt10(pNv->pInt);
 	return FALSE;
     }
+    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
     
     /* We use a programmable clock */
     pScrn->progClock = TRUE;
diff --git a/src/riva_driver.c b/src/riva_driver.c
index f0fcab4..b52f476 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -484,6 +484,7 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
 	xf86FreeInt10(pRiva->pInt);
 	return FALSE;
     }
+    vgaHWSetStdFuncs(VGAHWPTR(pScrn));
     
     /* We use a programmable clock */
     pScrn->progClock = TRUE;
commit 5b7f07f8171dd5ca4f13d7da25d7d91140b036e1
Author: Adam Jackson <ajax at redhat.com>
Date:   Mon Dec 19 16:55:30 2011 -0500

    Make failure to XAA non-fatal
    
    Fall back to NoAccel on G80 since there's no shadowfb support there,
    otherwise fall to shadowfb.
    
    Signed-off-by: Adam Jackson <ajax at redhat.com>

diff --git a/src/g80_driver.c b/src/g80_driver.c
index 551abe3..35e5d7e 100644
--- a/src/g80_driver.c
+++ b/src/g80_driver.c
@@ -429,10 +429,10 @@ G80PreInit(ScrnInfoPtr pScrn, int flags)
     if(!pNv->NoAccel) {
         switch(pNv->AccelMethod) {
         case XAA:
-            if(!xf86LoadSubModule(pScrn, "xaa")) goto fail;
+            if(!xf86LoadSubModule(pScrn, "xaa")) pNv->NoAccel = 1;
             break;
         case EXA:
-            if(!xf86LoadSubModule(pScrn, "exa")) goto fail;
+            if(!xf86LoadSubModule(pScrn, "exa")) pNv->NoAccel = 1;
             break;
         }
     }
diff --git a/src/nv_driver.c b/src/nv_driver.c
index 3031f8b..195299a 100644
--- a/src/nv_driver.c
+++ b/src/nv_driver.c
@@ -2048,9 +2048,9 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
     /* Load XAA if needed */
     if (!pNv->NoAccel) {
 	if (!xf86LoadSubModule(pScrn, "xaa")) {
-	    xf86FreeInt10(pNv->pInt);
-	    NVFreeRec(pScrn);
-	    return FALSE;
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadwwfb\n");
+	    pNv->NoAccel = 1;
+	    pNv->ShadowFB = 1;
 	}
     }
 
diff --git a/src/riva_driver.c b/src/riva_driver.c
index e33a7f3..f0fcab4 100644
--- a/src/riva_driver.c
+++ b/src/riva_driver.c
@@ -769,9 +769,9 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
     /* Load XAA if needed */
     if (!pRiva->NoAccel) {
 	if (!xf86LoadSubModule(pScrn, "xaa")) {
-	    xf86FreeInt10(pRiva->pInt);
-	    RivaFreeRec(pScrn);
-	    return FALSE;
+	    xf86DrvMsg(pScrn->scrnIndex, X_INFO, "Falling back to shadowfb\n");
+	    pRiva->NoAccel = 1;
+	    pRiva->ShadowFB = 1;
 	}
     }