xf86-video-ati: Branch 'master'

[George Sapountzis]

 src/atipreinit.c |   35 ++++++++++++++++-------------------
 1 files changed, 16 insertions(+), 19 deletions(-)

New commits:
diff-tree fa30ec6d5cd9bf4eb1a960592ca7311175219e4b (from 1777dcc1956d910073e13322767d9a3de41a949b)
Author: George Sapountzis <gsap7 at yahoo.gr>
Date:   Tue Feb 13 15:35:32 2007 +0200

    [mach64] PreInit: maxPitch, minor cosmetic.

diff --git a/src/atipreinit.c b/src/atipreinit.c
index 9ba6676..e18e27a 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -2241,29 +2241,25 @@ ATIPreInit
 
     pitchInc = minPitch * pATI->bitsPerPixel;
 
-    {
-            pScreenInfo->maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3;
-
-            if (pATI->Chip < ATI_CHIP_264VT)
-            {
-                /*
-                 * ATI finally fixed accelerated doublescanning in the 264VT
-                 * and later.  On 88800's, the bit is documented to exist, but
-                 * only doubles the vertical timings.  On the 264CT and 264ET,
-                 * the bit is ignored.
-                 */
-                ATIClockRange.doubleScanAllowed = FALSE;
-
-                /* CRTC_H_TOTAL is one bit narrower */
-                pScreenInfo->maxHValue >>= 1;
-            }
+    pScreenInfo->maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3;
 
-            pScreenInfo->maxVValue = MaxBits(CRTC_V_TOTAL) + 1;
+    if (pATI->Chip < ATI_CHIP_264VT)
+    {
+        /*
+         * ATI finally fixed accelerated doublescanning in the 264VT
+         * and later.  On 88800's, the bit is documented to exist, but
+         * only doubles the vertical timings.  On the 264CT and 264ET,
+         * the bit is ignored.
+         */
+        ATIClockRange.doubleScanAllowed = FALSE;
 
-            maxPitch = MaxBits(CRTC_PITCH);
+        /* CRTC_H_TOTAL is one bit narrower */
+        pScreenInfo->maxHValue >>= 1;
     }
 
-    maxPitch *= minPitch;
+    pScreenInfo->maxVValue = MaxBits(CRTC_V_TOTAL) + 1;
+
+    maxPitch = minPitch * MaxBits(CRTC_PITCH);
 
     if (pATI->OptionAccel)
     {
@@ -2273,6 +2269,7 @@ ATIPreInit
          */
         if (maxPitch > (ATIMach64MaxX / pATI->XModifier))
             maxPitch = ATIMach64MaxX / pATI->XModifier;
+
         maxHeight = ATIMach64MaxY;
 
         /*