xf86-video-ati: Branch 'master'

[George Sapountzis]

 src/aticonfig.c    |   25 ++++++++++++++-----------
 src/atimach64exa.c |    9 ---------
 2 files changed, 14 insertions(+), 20 deletions(-)

New commits:
diff-tree 482b85144fee42b6543dcc97a75899e363e05e9e (from eda9fb15e8bc042661a91a3d8c921006dfb3ddd9)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Mon Feb 12 14:27:37 2007 +0200

    [mach64] Enable RENDER acceleration on the Pro variants.

diff --git a/src/aticonfig.c b/src/aticonfig.c
index 37cc9cd..eeb0a70 100644
--- a/src/aticonfig.c
+++ b/src/aticonfig.c
@@ -156,25 +156,26 @@ ATIProcessOptions
     xf86CollectOptions(pScreenInfo, NULL);
 
     /* Set non-zero defaults */
-    {
-        Accel = CacheMMIO = HWCursor = TRUE;
-
-#ifdef TV_OUT
-
-	TvStd = "None";  /* No tv standard change requested */
-
-#endif
-    }
+    Accel = CacheMMIO = HWCursor = TRUE;
 
     ReferenceClock = ((double)157500000.0) / ((double)11.0);
 
     ShadowFB = TRUE;
 
     Blend = PanelDisplay = TRUE;
+
+#ifdef USE_EXA
+    RenderAccel = TRUE;
+#endif
+
 #ifdef XF86DRI_DEVEL
     DMAMode = "async";
 #endif
 
+#ifdef TV_OUT
+    TvStd = "None";  /* No tv standard change requested */
+#endif
+
     xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options,
         PublicOption);
     xf86ProcessOptions(pScreenInfo->scrnIndex, pScreenInfo->options,
@@ -315,9 +316,11 @@ ATIProcessOptions
             pATI->useEXA ? "EXA" : "XAA");
 
 #if defined(USE_EXA)
-        pATI->RenderAccelEnabled = FALSE;
-        if (pATI->useEXA && RenderAccel)
+        if (pATI->useEXA && pATI->Chip >= ATI_CHIP_264GTPRO)
             pATI->RenderAccelEnabled = TRUE;
+
+        if (pATI->useEXA && !RenderAccel)
+            pATI->RenderAccelEnabled = FALSE;
 #endif
     }
 
diff --git a/src/atimach64exa.c b/src/atimach64exa.c
index a2f1afe..67c5f22 100644
--- a/src/atimach64exa.c
+++ b/src/atimach64exa.c
@@ -638,15 +638,6 @@ Bool ATIMach64ExaInit(ScreenPtr pScreen)
     ATIPtr pATI = ATIPTR(pScreenInfo);
     ExaDriverPtr pExa;
 
-    /* FIXME: which chips support EXA ? */
-    if (pATI->Chip < ATI_CHIP_264CT)
-    {
-        xf86DrvMsg(pScreenInfo->scrnIndex, X_ERROR,
-            "EXA is not supported for ATI chips earlier than "
-            "the ATI Mach64.\n");
-        return FALSE;
-    }
-
     pExa = exaDriverAlloc();
     if (!pExa)
         return FALSE;