Author: branden
Date: 2004-01-22 23:26:00 -0500 (Thu, 22 Jan 2004)
New Revision: 967
Modified:
branches/4.3.0/sid/debian/changelog
branches/4.3.0/sid/debian/patches/022_r128_driver_pitch_tweak.diff
Log:
Fix Xv support in r128 driver to work in conjuction with an earlier patch
to let the driver permit framebuffer pitches in multiples of 8 bytes,
which enabled support for some models of Rage 128, but broke video in
depth 24 (thanks, Michel D?\195?\164nzer and Dagfinn Ilmari Manns?\195?\165ker).
(Closes: #148775)
Modified: branches/4.3.0/sid/debian/changelog
===================================================================
--- branches/4.3.0/sid/debian/changelog 2004-01-23 01:10:54 UTC (rev 966)
+++ branches/4.3.0/sid/debian/changelog 2004-01-23 04:26:00 UTC (rev 967)
@@ -157,8 +157,15 @@
architecture.
- debian/control
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 22 Jan 2004 15:34:55 -0500
+ * Fix Xv support in r128 driver to work in conjuction with an earlier patch
+ to let the driver permit framebuffer pitches in multiples of 8 bytes,
+ which enabled support for some models of Rage 128, but broke video in
+ depth 24 (thanks, Michel Dänzer and Dagfinn Ilmari Mannsåker).
+ (Closes: #148775)
+ - debian/patches/022_r128_driver_pitch_tweak.diff
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 22 Jan 2004 23:21:45 -0500
+
xfree86 (4.3.0-0pre1v5) experimental; urgency=low
* Grab fixes to upstream CVS xf-4_3-branch since last pull.
Modified: branches/4.3.0/sid/debian/patches/022_r128_driver_pitch_tweak.diff
===================================================================
--- branches/4.3.0/sid/debian/patches/022_r128_driver_pitch_tweak.diff
2004-01-23 01:10:54 UTC (rev 966)
+++ branches/4.3.0/sid/debian/patches/022_r128_driver_pitch_tweak.diff
2004-01-23 04:26:00 UTC (rev 967)
@@ -1,7 +1,10 @@
$Id$
-This patch by Branden Robinson after consultation with Michel D�nzer.
+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
@@ -19,3 +22,29 @@
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
+@@ -694,20 +694,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);
+ }
+
