Attachment 1329 Details for Bug 1888 – [FIXED_X11R68x] trivial patch

[patch] [FIXED_X11R68x] trivial patch

022_ati_r128_support_800_byte_pitch.diff (text/plain), 1.71 KB, created by Daniel Stone on 2004-11-22 09:30:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Stone

Created: 2004-11-22 09:30:59 UTC

Size: 1.71 KB

patch

obsolete

>$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);
>    }
>

Flags:

roland.mainz: 6.8-branch+

Actions: View | Splinter Review

Attachments on bug 1888: 1329

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.