Author: julien
Date: 2006-12-24 13:03:36 -0500 (Sun, 24 Dec 2006)
New Revision: 4165

Added:
   
trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff
Modified:
   trunk/driver/xserver-xorg-video-savage/debian/changelog
   trunk/driver/xserver-xorg-video-savage/debian/patches/series
Log:
* Add patch by Mikko Rapeli <[EMAIL PROTECTED]> to fix a crash when the
  last client exits and the server is respawned, closes: #397084. Thanks,
  Mikko!

Modified: trunk/driver/xserver-xorg-video-savage/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-video-savage/debian/changelog     2006-12-20 
03:59:52 UTC (rev 4164)
+++ trunk/driver/xserver-xorg-video-savage/debian/changelog     2006-12-24 
18:03:36 UTC (rev 4165)
@@ -4,8 +4,11 @@
     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.
+  * Add patch by Mikko Rapeli <[EMAIL PROTECTED]> to fix a crash when the
+    last client exits and the server is respawned, closes: #397084. Thanks,
+    Mikko!
 
- -- Julien Cristau <[EMAIL PROTECTED]>  Tue,  7 Nov 2006 07:30:43 +0100
+ -- Julien Cristau <[EMAIL PROTECTED]>  Sun, 24 Dec 2006 18:55:47 +0100
 
 xserver-xorg-video-savage (1:2.1.2-1) unstable; urgency=low
 

Added: 
trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff
===================================================================
--- 
trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff
                          (rev 0)
+++ 
trunk/driver/xserver-xorg-video-savage/debian/patches/02_fix_respawn_crash_regression.diff
  2006-12-24 18:03:36 UTC (rev 4165)
@@ -0,0 +1,22 @@
+This patch by Mikko Rapeli <[EMAIL PROTECTED]>.
+
+The savage driver some time ago started crashing when respawned from
+kdm et al.  When MapMMIO and MapFB functions were merged to MapMem, one
+MapFB call in SavageScreenInit was not replaced with MapMem.
+
+See Debian bugs #397084 and #398860.
+
+Index: xserver-xorg-video-savage/src/savage_driver.c
+===================================================================
+--- xserver-xorg-video-savage.orig/src/savage_driver.c 2006-12-24 
18:47:22.000000000 +0100
++++ xserver-xorg-video-savage/src/savage_driver.c      2006-12-24 
18:50:34.000000000 +0100
+@@ -3096,6 +3096,9 @@
+  
+     SavageEnableMMIO(pScrn);
+ 
++    if (!SavageMamMem(pScrn))
++        return FALSE;
++
+     psav->FBStart2nd = 0;
+ 
+     if (psav->overlayDepth) {

Modified: trunk/driver/xserver-xorg-video-savage/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-video-savage/debian/patches/series        
2006-12-20 03:59:52 UTC (rev 4164)
+++ trunk/driver/xserver-xorg-video-savage/debian/patches/series        
2006-12-24 18:03:36 UTC (rev 4165)
@@ -1 +1,2 @@
 01_savage_driver_disable_randr_on_rotation.diff
+02_fix_respawn_crash_regression.diff


-- 
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]

Reply via email to