$Id$

Driver patch by Branden Robinson after consultation with Michel Dänzer.

Xv patch by Dagfinn Ilmari Mannsåker after suggestion by Michel Dänzer.
This is needed or Xv will not work in depth 24 (see Debian #148775).

Not submitted upstream yet.

--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c~	Sun Apr 28 19:41:21 2002
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_driver.c	Sun Apr 28 19:43:04 2002
@@ -1640,7 +1640,11 @@
 				   NULL,        /* linePitches */
 				   8 * 64,      /* minPitch */
 				   8 * 1024,    /* maxPitch */
-				   8 * 64,      /* pitchInc */
+/*
+ * ATI docs say pitchInc must be 8 * 64, but this doesn't permit a pitch of
+ * 800 bytes, which is known to work on the Rage128 LF on clamshell iBooks
+ */
+				   8 * 32,      /* pitchInc */
 				   128,         /* minHeight */
 				   2048,        /* maxHeight */
 				   pScrn->display->virtualX,
--- xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c	2003-02-19 02:19:41.000000000 +0100
+++ xc/programs/Xserver/hw/xfree86/drivers/ati/r128_video.c	2004-01-22 23:51:43.000000000 +0100
@@ -579,20 +579,20 @@
 
    pScreen = screenInfo.screens[pScrn->scrnIndex];
 
-   new_linear = xf86AllocateOffscreenLinear(pScreen, size, 16,
+   new_linear = xf86AllocateOffscreenLinear(pScreen, size, 8,
 						NULL, NULL, NULL);
 
    if(!new_linear) {
 	int max_size;
 
-	xf86QueryLargestOffscreenLinear(pScreen, &max_size, 16,
+	xf86QueryLargestOffscreenLinear(pScreen, &max_size, 8,
 						PRIORITY_EXTREME);
 
 	if(max_size < size)
 	   return NULL;
 
 	xf86PurgeUnlockedOffscreenAreas(pScreen);
-	new_linear = xf86AllocateOffscreenLinear(pScreen, size, 16,
+	new_linear = xf86AllocateOffscreenLinear(pScreen, size, 8,
 						NULL, NULL, NULL);
    }