xf86-video-intel: Branch 'xf86-video-intel-2.3-branch' - src/i830_exa.c

[Zhenyu Wang]

 src/i830_exa.c |    6 ------
 1 file changed, 6 deletions(-)

New commits:
commit bfcc83ad1a3eb7b2acc44223c86fa007cd34a27c
Author: Zhenyu Wang <zhenyu.z.wang at intel.com>
Date:   Fri Apr 18 16:48:38 2008 +0800

    Revert "Set EXA pitch limit for pre-965 chipset"
    
    This reverts commit 602613e397bdf0cf701a6a7748f9343875864466.
    
    Pre-965 chipset actually have different pitch limit for 2d and 3d
    engine. For 2D blit, it's 32KB max. For 3D, it's 8KB max. Don't
    limit it to minimal which fallback 2D operations (noteable copy
    slow).

diff --git a/src/i830_exa.c b/src/i830_exa.c
index 9e43bf7..9b5bb93 100644
--- a/src/i830_exa.c
+++ b/src/i830_exa.c
@@ -510,17 +510,11 @@ I830EXAInit(ScreenPtr pScreen)
 	pI830->EXADriverPtr->pixmapPitchAlign = 16;
 	pI830->EXADriverPtr->maxX = 8192;
 	pI830->EXADriverPtr->maxY = 8192;
-	/* maxPitch setting not necessary on 965, as hw support
-	 * exa max pitch 128KB. */
     } else {
 	pI830->EXADriverPtr->pixmapOffsetAlign = 4;
 	pI830->EXADriverPtr->pixmapPitchAlign = 16;
 	pI830->EXADriverPtr->maxX = 2048;
 	pI830->EXADriverPtr->maxY = 2048;
-#if EXA_VERSION_MINOR >= 3
-	pI830->EXADriverPtr->maxPitchPixels = pI830->EXADriverPtr->maxX;
-	pI830->EXADriverPtr->maxPitchBytes = KB(8);
-#endif
     }
 
     /* Sync */