debian/changelog | 8 +++
debian/patches/dont-run-intel-mode-fini-before-preinit.diff | 27 ++++++++++++
debian/patches/series | 2
3 files changed, 36 insertions(+), 1 deletion(-)
New commits:
commit 21ec4ffc475937ca00293e7b88717788634bb1ac
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Sep 26 15:25:43 2012 +0300
release to quantal
diff --git a/debian/changelog b/debian/changelog
index 6134d33..8f2cb69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-video-intel (2:2.20.8-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.20.8-0ubuntu2) quantal; urgency=low
* dont-run-intel-mode-fini-before-preinit.diff, don't crash if
Screen is deleted before the driver has fully initialized.
commit 36a7790f9a5f53d9e0fbb82e15f26653daf25570
Author: Timo Aaltonen <tjaal...@ubuntu.com>
Date: Wed Sep 26 15:25:06 2012 +0300
dont-run-intel-mode-fini-before-preinit.diff
don't crash if Screen is deleted before the driver has fully
initialized. (LP: #1053836)
diff --git a/debian/changelog b/debian/changelog
index e995e19..6134d33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-intel (2:2.20.8-0ubuntu2) UNRELEASED; urgency=low
+
+ * dont-run-intel-mode-fini-before-preinit.diff, don't crash if
+ Screen is deleted before the driver has fully initialized.
+ (LP: #1053836)
+
+ -- Timo Aaltonen <tjaal...@ubuntu.com> Wed, 26 Sep 2012 15:14:07 +0300
+
xserver-xorg-video-intel (2:2.20.8-0ubuntu1) quantal; urgency=low
* Merge from unreleased debian git.
diff --git a/debian/patches/dont-run-intel-mode-fini-before-preinit.diff
b/debian/patches/dont-run-intel-mode-fini-before-preinit.diff
new file mode 100644
index 0000000..f17fc60
--- /dev/null
+++ b/debian/patches/dont-run-intel-mode-fini-before-preinit.diff
@@ -0,0 +1,27 @@
+commit addfa653cf51fa45c7eae49be1fd722aaadf97d6
+Author: Chris Wilson <ch...@chris-wilson.co.uk>
+Date: Wed Sep 26 08:59:18 2012 +0100
+
+ uxa: Prevent attempting to call intel_mode_fini() before PreInit runs
+
+ In the Ubuntu xserver it is apparently possible for the Screen to be
+ deleted prior to being fully initialised. Make sure we don't crash in
+ that situation!
+
+ Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=55346
+ Signed-off-by: Chris Wilson <ch...@chris-wilson.co.uk>
+
+diff --git a/src/intel_display.c b/src/intel_display.c
+index 2a3a393..60af415 100644
+--- a/src/intel_display.c
++++ b/src/intel_display.c
+@@ -1770,6 +1770,9 @@ intel_mode_fini(intel_screen_private *intel)
+ {
+ struct intel_mode *mode = intel->modes;
+
++ if (mode == NULL)
++ return;
++
+ while(!list_is_empty(&mode->crtcs)) {
+ xf86CrtcDestroy(list_first_entry(&mode->crtcs,
+ struct intel_crtc,
diff --git a/debian/patches/series b/debian/patches/series
index a82d1b4..5028b7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-#placeholder
+dont-run-intel-mode-fini-before-preinit.diff
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1tgqxb-000344...@vasks.debian.org
