xf86-video-ati: Branch 'master'

[George Sapountzis]

 src/atipreinit.c |   12 ++++--------
 src/atistruct.h  |    1 -
 2 files changed, 4 insertions(+), 9 deletions(-)

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

    [mach64] PreInit: pitchInc is local.

diff --git a/src/atipreinit.c b/src/atipreinit.c
index 9c3b619..9ba6676 100644
--- a/src/atipreinit.c
+++ b/src/atipreinit.c
@@ -181,7 +181,7 @@ ATIPreInit
     int              MinX, MinY;
     ClockRange       ATIClockRange = {NULL, 0, 80000, -1, TRUE, TRUE, 1, 1, 0};
     int              DefaultmaxClock = 0;
-    int              minPitch, maxPitch = 0xFFU, maxHeight = 0;
+    int              minPitch, maxPitch = 0xFFU, pitchInc, maxHeight = 0;
     int              ApertureSize = 0x00010000U;
     int              ModeType = M_T_BUILTIN;
     LookupModeFlags  Strategy = LOOKUP_CLOSEST_CLOCK;
@@ -2239,11 +2239,7 @@ ATIPreInit
         minPitch = 16;
     }
 
-    pATI->pitchInc = minPitch;
-
-    {
-        pATI->pitchInc *= pATI->bitsPerPixel;
-    }
+    pitchInc = minPitch * pATI->bitsPerPixel;
 
     {
             pScreenInfo->maxHValue = (MaxBits(CRTC_H_TOTAL) + 1) << 3;
@@ -2286,7 +2282,7 @@ ATIPreInit
         if ((pATI->Chip >= ATI_CHIP_264CT) &&
             ((pATI->Chip >= ATI_CHIP_264VTB) ||
              (pATI->MemoryType >= MEM_264_SGRAM)))
-            pATI->pitchInc = pATI->XModifier * (64 * 8);
+            pitchInc = pATI->XModifier * (64 * 8);
     }
 
     if (pATI->OptionPanelDisplay && (pATI->LCDPanelID >= 0))
@@ -2415,7 +2411,7 @@ ATIPreInit
     i = xf86ValidateModes(pScreenInfo,
             pScreenInfo->monitor->Modes, pScreenInfo->display->modes,
             &ATIClockRange, NULL, minPitch, maxPitch,
-            pATI->pitchInc, 0, maxHeight,
+            pitchInc, 0, maxHeight,
             pScreenInfo->display->virtualX, pScreenInfo->display->virtualY,
             ApertureSize, Strategy);
     if (i <= 0)
diff --git a/src/atistruct.h b/src/atistruct.h
index e50cbb5..99be359 100644
--- a/src/atistruct.h
+++ b/src/atistruct.h
@@ -382,7 +382,6 @@ typedef struct _ATIRec
     DisplayModePtr currentMode;
     CARD8 depth, bitsPerPixel;
     short int displayWidth;
-    int pitchInc;
     rgb weight;
 
 #ifndef AVOID_DGA