Bug#520547: [SRM] xserver-xorg-video-savage update in lenny

[Julien Cristau]

On Fri, 2009-03-20 at 20:27 +0100, Tormod Volden wrote:
> The problem appears if a savage laptop chipset is used without a
> connected LCD panel, for instance in small-form-factor PCs. The driver
> will extract sync range information from the panel information which
> is not valid.
> 
> The fix has been applied upstream in
> http://cgit.freedesktop.org/xorg/driver/xf86-video-savage/commit/?id=0fae48235841f05d7e52e61a2450835fdb8892b3
> 
> Also reported in Ubuntu, https://bugs.launchpad.net/bugs/294899

Hi SRMs,

would the attached debdiff for bug#520547 be accepted in lenny?

Thanks,
Julien

diff -u xserver-xorg-video-savage-2.2.1/debian/changelog xserver-xorg-video-savage-2.2.1/debian/changelog
--- xserver-xorg-video-savage-2.2.1/debian/changelog
+++ xserver-xorg-video-savage-2.2.1/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-savage (1:2.2.1-2.lenny1) stable; urgency=low
+
+  * Cherry-pick from upstream: Do not add panel modes when there is no panel
+    (closes: #520547).  Thanks, Tormod Volden!
+
+ -- Julien Cristau <jcris...@debian.org>  Fri, 20 Mar 2009 21:35:43 +0100
+
 xserver-xorg-video-savage (1:2.2.1-2) unstable; urgency=low
 
   * Reenable 02_temporary_revert_pciaccess.diff and append all recent
only in patch2:
unchanged:
--- xserver-xorg-video-savage-2.2.1.orig/src/savage_driver.c
+++ xserver-xorg-video-savage-2.2.1/src/savage_driver.c
@@ -2190,10 +2190,11 @@
     /* Check LCD panel information */
 
     if(psav->DisplayType == MT_LCD)
-    {
 	SavageGetPanelInfo(pScrn);
+
+    /* DisplayType will be reset if panel is not active */
+    if(psav->DisplayType == MT_LCD)
 	SavageAddPanelMode(pScrn);
-    }
   
 #if 0
     if (psav->CrtOnly && !psav->UseBIOS) {