X Strike Force X.Org X11 SVN commit: r4140 - in trunk/driver/xserver-xorg-video-mga/debian: . patches
Author: julien
Date: 2006-12-11 20:55:04 -0500 (Mon, 11 Dec 2006)
New Revision: 4140
Added:
trunk/driver/xserver-xorg-video-mga/debian/patches/04-Bug-2168-Fix-graphics-corruptions-with-Mystique-rev-2.diff
Modified:
trunk/driver/xserver-xorg-video-mga/debian/changelog
trunk/driver/xserver-xorg-video-mga/debian/patches/series
Log:
* Steal patch from upstream git which should fix a graphics corruption with
Mystique rev2 cards (closes: #320328).
Modified: trunk/driver/xserver-xorg-video-mga/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/changelog 2006-12-11 12:25:39 UTC (rev 4139)
+++ trunk/driver/xserver-xorg-video-mga/debian/changelog 2006-12-12 01:55:04 UTC (rev 4140)
@@ -4,8 +4,10 @@
the user's config and log files.
* Bump dependency on xserver-xorg-core to >= 2:1.1.1-11, as previous
versions don't have the bug script.
+ * Steal patch from upstream git which should fix a graphics corruption with
+ Mystique rev2 cards (closes: #320328).
- -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 7 Nov 2006 07:30:42 +0100
+ -- Julien Cristau <julien.cristau@ens-lyon.org> Tue, 12 Dec 2006 02:51:07 +0100
xserver-xorg-video-mga (1:1.4.4.dfsg.1-1) unstable; urgency=low
Added: trunk/driver/xserver-xorg-video-mga/debian/patches/04-Bug-2168-Fix-graphics-corruptions-with-Mystique-rev-2.diff
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/patches/04-Bug-2168-Fix-graphics-corruptions-with-Mystique-rev-2.diff (rev 0)
+++ trunk/driver/xserver-xorg-video-mga/debian/patches/04-Bug-2168-Fix-graphics-corruptions-with-Mystique-rev-2.diff 2006-12-12 01:55:04 UTC (rev 4140)
@@ -0,0 +1,27 @@
+From be88d58968c604624617f40820dc9a50a92661be Mon Sep 17 00:00:00 2001
+From: Tilman Sauerbeck <tilman@code-monkey.de>
+Date: Sun, 19 Nov 2006 21:04:01 +0100
+Subject: [PATCH] Bug #2168: Fix graphics corruptions with Mystique rev 2.
+
+---
+ src/mga_storm.c | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/mga_storm.c b/src/mga_storm.c
+index 417675f..6fa83bd 100644
+--- a/src/mga_storm.c
++++ b/src/mga_storm.c
+@@ -1089,8 +1089,8 @@ MGAStormSync(ScrnInfoPtr pScrn)
+
+ 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)))
++ /* MGAISBUSY() reportedly causes a freeze for Mystique revisions 0 and 1 */
++ if (!(pMga->Chipset == PCI_CHIP_MGA1064 && (pMga->ChipRev >= 0 && pMga->ChipRev <= 1)))
+ while(MGAISBUSY());
+ /* flush cache before a read (mga-1064g 5.1.6) */
+ OUTREG8(MGAREG_CRTC_INDEX, 0);
+--
+1.4.4.1
+
Modified: trunk/driver/xserver-xorg-video-mga/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-mga/debian/patches/series 2006-12-11 12:25:39 UTC (rev 4139)
+++ trunk/driver/xserver-xorg-video-mga/debian/patches/series 2006-12-12 01:55:04 UTC (rev 4140)
@@ -1,2 +1,3 @@
01_stupid_configure_error.diff
03_no_nonfree.diff
+04-Bug-2168-Fix-graphics-corruptions-with-Mystique-rev-2.diff
Reply to: