xserver-xorg-video-ati: Changes to 'ubuntu'
debian/changelog | 4 +++-
debian/patches/drmmode-fail.patch | 31 +++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 35 insertions(+), 1 deletion(-)
New commits:
commit 7b4d292aa17cb8a338c88224d65371c15218512b
Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
Date: Thu Mar 21 15:43:33 2013 +0100
Handle drmModeGetConnector failure better, and release to raring.
drmmode-fail.patch
diff --git a/debian/changelog b/debian/changelog
index 3b5c8ee..4802c20 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-xserver-xorg-video-ati (1:7.1.0-0ubuntu2) UNRELEASED; urgency=low
+xserver-xorg-video-ati (1:7.1.0-0ubuntu2) raring; urgency=low
* Fix not removing socket and block handler on close (LP: #1157614)
- fixup-close.patch
+ * Handle drmModeGetConnector failure better.
+ - drmmode-fail.patch
-- Maarten Lankhorst <mlankhorst@raring-amd64.local> Wed, 20 Mar 2013 14:00:46 +0000
diff --git a/debian/patches/drmmode-fail.patch b/debian/patches/drmmode-fail.patch
new file mode 100644
index 0000000..f3ad262
--- /dev/null
+++ b/debian/patches/drmmode-fail.patch
@@ -0,0 +1,31 @@
+commit 35b384a00a0c76ea556f55787fccc95ecd51bc0c
+Author: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+Date: Thu Mar 21 15:34:21 2013 +0100
+
+ drmmode: handle failure of drmModeGetConnector
+
+ Signed-off-by: Maarten Lankhorst <maarten.lankhorst@canonical.com>
+
+diff --git a/src/drmmode_display.c b/src/drmmode_display.c
+index 87ab268..4c50a1b 100644
+--- a/src/drmmode_display.c
++++ b/src/drmmode_display.c
+@@ -716,6 +716,8 @@ drmmode_output_detect(xf86OutputPtr output)
+ drmModeFreeConnector(drmmode_output->mode_output);
+
+ drmmode_output->mode_output = drmModeGetConnector(drmmode->fd, drmmode_output->output_id);
++ if (!drmmode_output->mode_output)
++ return XF86OutputStatusDisconnected;
+
+ switch (drmmode_output->mode_output->connection) {
+ case DRM_MODE_CONNECTED:
+@@ -749,6 +751,9 @@ drmmode_output_get_modes(xf86OutputPtr output)
+ drmModePropertyPtr props;
+ xf86MonPtr mon = NULL;
+
++ if (!koutput)
++ return NULL;
++
+ /* look for an EDID property */
+ for (i = 0; i < koutput->count_props; i++) {
+ props = drmModeGetProperty(drmmode->fd, koutput->props[i]);
diff --git a/debian/patches/series b/debian/patches/series
index 6c6e0ef..0bafc67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
reverse-prime.patch
fixup-close.patch
+drmmode-fail.patch
Reply to: