xorg-server: Changes to 'ubuntu'
debian/changelog | 6 +++++-
debian/patches/162_null_crtc_in_rotation.patch | 13 +++++++++++++
debian/patches/series | 1 +
3 files changed, 19 insertions(+), 1 deletion(-)
New commits:
commit 7b8638cdca5dd87cc9a083782c5e8058aa5075a3
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Mon Mar 2 23:19:57 2009 -0800
Null pointer check for error that happens when two cards are present.
diff --git a/debian/changelog b/debian/changelog
index 2895083..e3caa91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,13 +2,17 @@ xorg-server (2:1.6.0-0ubuntu1) UNRELEASED; urgency=low
[ Bryce Harrington ]
* New upstream release (LP: #319210)
+ * Add 162_null_crtc_in_rotation.patch: Fixes crash when two displays on
+ separate cards are attached. X doesn't work with multiple cards yet,
+ but crashing is not an appropriate way to handle such a situation.
+ (LP: #139990)
[ Timo Aaltonen ]
* 159_xinerama_focus.patch,
161_force_paired_kbd_device.patch:
- Dropped, applied upstream
- -- Timo Aaltonen <tjaalton@ubuntu.com> Tue, 03 Mar 2009 00:06:38 +0200
+ -- Bryce Harrington <bryce@ubuntu.com> Mon, 02 Mar 2009 23:02:25 -0800
xorg-server (2:1.6.0-1) UNRELEASED; urgency=low
diff --git a/debian/patches/162_null_crtc_in_rotation.patch b/debian/patches/162_null_crtc_in_rotation.patch
new file mode 100644
index 0000000..2e4a945
--- /dev/null
+++ b/debian/patches/162_null_crtc_in_rotation.patch
@@ -0,0 +1,13 @@
+diff -Nurp patched/hw/xfree86/modes/xf86RandR12.c working/hw/xfree86/modes/xf86RandR12.c
+--- patched/hw/xfree86/modes/xf86RandR12.c 2009-03-02 22:57:18.000000000 -0800
++++ working/hw/xfree86/modes/xf86RandR12.c 2009-03-02 22:57:24.000000000 -0800
+@@ -944,7 +944,8 @@ xf86RandR12SetRotations (ScreenPtr pScre
+ for (c = 0; c < config->num_crtc; c++) {
+ xf86CrtcPtr crtc = config->crtc[c];
+
+- RRCrtcSetRotations (crtc->randr_crtc, rotations);
++ if (crtc != NULL)
++ RRCrtcSetRotations (crtc->randr_crtc, rotations);
+ }
+ #endif
+ randrp->supported_rotations = rotations;
diff --git a/debian/patches/series b/debian/patches/series
index a4de028..353b282 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,4 +17,5 @@
157_check_null_modes.patch
#158_raise_maxclients.patch
160_log_timestamping.patch
+162_null_crtc_in_rotation.patch
999_default_modedebug_on.patch
Reply to: