xorg-server: Changes to 'debian-unstable'
debian/changelog | 4 ++
debian/patches/44_preferredmode_infinite_loop.diff | 31 +++++++++++++++++++++
debian/patches/series | 1
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 826ddcc2a27e069d7ba644d3b10253b17068bfe8
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Dec 2 00:58:05 2007 +0100
Add patch 44_preferredmode_infinite_loop.diff from upstream git
fixes an infinite loop when PreferredMode is used in xorg.conf.
diff --git a/debian/changelog b/debian/changelog
index b600ad9..cb16609 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ xorg-server (2:1.4.1~git20071119-2) UNRELEASED; urgency=low
hardcoding "Debian".
* debian/control: build-dep on lsb-release.
* Cherry-pick commit f30abe30 from master: edid quirk for MAX 0x77e monitor.
+ * Add patch 44_preferredmode_infinite_loop.diff from upstream git: fixes an
+ infinite loop when PreferredMode is used in xorg.conf.
- -- Julien Cristau <jcristau@debian.org> Fri, 30 Nov 2007 14:00:16 +0100
+ -- Julien Cristau <jcristau@debian.org> Sun, 02 Dec 2007 00:56:53 +0100
xorg-server (2:1.4.1~git20071119-1) unstable; urgency=low
diff --git a/debian/patches/44_preferredmode_infinite_loop.diff b/debian/patches/44_preferredmode_infinite_loop.diff
new file mode 100644
index 0000000..9ab791d
--- /dev/null
+++ b/debian/patches/44_preferredmode_infinite_loop.diff
@@ -0,0 +1,31 @@
+From 29e0e180729a4f0cc020985a4de4c8bc4b9c7f5f Mon Sep 17 00:00:00 2001
+From: Keith Packard <keithp@koto.keithp.com>
+Date: Mon, 22 Oct 2007 13:38:16 -0700
+Subject: [PATCH] Leave hardware-specified preferred modes alone when user preference exists.
+
+Instead of removing the preference bit marking the hardware declared mode
+preference, leave it in place and just move the user preferred mode to the
+front of the list while marking it with the USERPREF bit which will cause it
+to be selected by the initial mode selection code.
+---
+ hw/xfree86/modes/xf86Crtc.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
+index 0a48d5b..bb416fd 100644
+--- a/hw/xfree86/modes/xf86Crtc.c
++++ b/hw/xfree86/modes/xf86Crtc.c
+@@ -1417,9 +1417,8 @@ xf86ProbeOutputModes (ScrnInfoPtr scrn, int maxX, int maxY)
+ output->probed_modes = mode;
+ }
+ mode->type |= (M_T_PREFERRED|M_T_USERPREF);
++ break;
+ }
+- else
+- mode->type &= ~M_T_PREFERRED;
+ }
+ }
+
+--
+1.5.3.6
+
diff --git a/debian/patches/series b/debian/patches/series
index cd09885..08a6b93 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,6 +12,7 @@
21_glx_align_fixes.patch
41_vbe_filter_less.diff
43_allow_override_BIOS_EDID_preferred_mode.diff
+44_preferredmode_infinite_loop.diff
#47_fbdevhw_magic_numbers.diff
#51_xkb-and-loathing.diff
91_ttf2pt1
Reply to: