X Strike Force X.Org X11 SVN commit: r890 - in trunk/debian: . patches patches/general
Author: dnusinow
Date: 2005-11-23 14:34:18 -0500 (Wed, 23 Nov 2005)
New Revision: 890
Added:
trunk/debian/patches/general/032_fix_matrox_display.diff
Modified:
trunk/debian/changelog
trunk/debian/patches/series
Log:
* Change ls to /bin/ls in Xsession to prevent login problems if ls is
locally aliased to ls --color=auto. Thanks January Weiner, David
Vernazobres. (closes: #340443, #337650)
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-11-23 19:22:02 UTC (rev 889)
+++ trunk/debian/changelog 2005-11-23 19:34:18 UTC (rev 890)
@@ -6,8 +6,10 @@
* Remove obsolete "| xlibs (> 4.1.0)" from various shlibs packaging files at
the request of the release team
* Change ls to /bin/ls in Xsession to prevent login problems if ls is
- locally aliased to ls --color=auto. Thanks January Weiner, David
+ locally aliased to ls --color=auto. Thanks January Weiner, David
Vernazobres. (closes: #340443, #337650)
+ * Add general/032_fix_matrox_display.diff to fix corruption on some cards.
+ Thanks Julien Wajsberg. (closes: #320328)
[ Christian Perrier ]
* Updated Russian translation (ru.po). Thanks, Yuri Kozlov!
@@ -15,7 +17,7 @@
* Added Romanian translation (ro.po). Thanks, Eddy Petrisor!
(closes: #338547, #338902).
- -- David Nusinow <dnusinow@debian.org> Wed, 23 Nov 2005 14:17:21 -0500
+ -- David Nusinow <dnusinow@debian.org> Wed, 23 Nov 2005 14:33:08 -0500
xorg-x11 (6.8.2.dfsg.1-10) unstable; urgency=low
Added: trunk/debian/patches/general/032_fix_matrox_display.diff
===================================================================
--- trunk/debian/patches/general/032_fix_matrox_display.diff 2005-11-23 19:22:02 UTC (rev 889)
+++ trunk/debian/patches/general/032_fix_matrox_display.diff 2005-11-23 19:34:18 UTC (rev 890)
@@ -0,0 +1,17 @@
+This fixes matrox display corruption on certain cards. Patch by Ondrej
+Zary. See https://bugs.freedesktop.org/show_bug.cgi?id=2168 and
+http://bugs.xfree86.org/show_bug.cgi?id=1313.
+
+Index: trunk/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c
+===================================================================
+--- trunk.orig/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c 2005-10-17 17:19:19.000000000 -0400
++++ trunk/xc/programs/Xserver/hw/xfree86/drivers/mga/mga_storm.c 2005-11-23 14:31:09.000000000 -0500
+@@ -1077,7 +1077,7 @@
+ CHECK_DMA_QUIESCENT(pMga, pScrn);
+
+ /* MGAISBUSY() reportedly causes a freeze for Mystique revision 2 and older */
+- if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 2)))
++ if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev < 2)))
+ while(MGAISBUSY());
+ /* flush cache before a read (mga-1064g 5.1.6) */
+ OUTREG8(MGAREG_CRTC_INDEX, 0);
Modified: trunk/debian/patches/series
===================================================================
--- trunk/debian/patches/series 2005-11-23 19:22:02 UTC (rev 889)
+++ trunk/debian/patches/series 2005-11-23 19:34:18 UTC (rev 890)
@@ -50,6 +50,7 @@
general/028_loader_speed_hack.diff -p0
general/029_only_open_proc_bus_pci_devices_once.diff -p0
general/031_disable_libXft1.diff
+general/032_fix_matrox_display.diff
general/035_tdfx_disable_dri_on_16mb_with_highres.diff -p0
general/040_extend_netmouse_support.diff -p0
general/041_make_xcursor_icondir_configurable.diff -p0
Reply to: