X Strike Force XFree86 SVN commit: r1128 - trunk/debian/patches
Author: branden
Date: 2004-03-04 08:52:42 -0500 (Thu, 04 Mar 2004)
New Revision: 1128
Modified:
trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff
Log:
Add proper annotations of patches from upstream CVS.
Modified: trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff
===================================================================
--- trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff 2004-03-04 13:02:52 UTC (rev 1127)
+++ trunk/debian/patches/000_stolen_from_HEAD_i830_driver.diff 2004-03-04 13:52:42 UTC (rev 1128)
@@ -1,9 +1,27 @@
$Id$
-Add a few tweaks to the i830_driver, the most significant being to automatically
-attempt to reserve as much BIOS memory as we've asked for with Option
-"VideoRAM", and a deadlock fix for i830G chips.
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h @ 1.9
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.36
+ 415. Remove some static variables that should be per-screen (David Dawes).
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.38
+ 453. Add gcc format checking for the X server's message and logging
+ functions, and fix lots of associated warnings (David Dawes).
+
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h @ 1.10
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.39
+ 495. i830/i810 driver:
+ * Added Christian Ziez's code to tweak BIOS image to convince chipset of
+ resized video RAM.
+ * Fixed viewport/video overlay window alingment issues.
+ * Fixed calculation of video overlay memory size.
+ * Fixed video overlay on TV out (BugzillaR #213). (Egbert Eich).
+
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h @ 1.11
+xc/programs/Xserver/hw/xfree86/drivers/i810/i830_driver.c @ 1.45
+ 515. When the i830 driver's checks for sufficient memory for tiled mode
+ fail, don't later try to allocate with tiling enabled (David Dawes).
+
diff -urN xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830.h xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h
--- xc.orig/programs/Xserver/hw/xfree86/drivers/i810/i830.h 2003-11-15 18:12:41.000000000 +1100
+++ xc/programs/Xserver/hw/xfree86/drivers/i810/i830.h 2003-11-15 18:14:32.000000000 +1100
Reply to: