xorg-server: Changes to 'ubuntu'
debian/changelog | 8 ++++++--
debian/patches/229_udev-fix.diff | 33 +++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 40 insertions(+), 2 deletions(-)
New commits:
commit 83c60ba9f1a51a81cbe0c9b94027d1011527ba91
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Sep 17 15:59:31 2012 +0300
really add the patch
diff --git a/debian/patches/229_udev-fix.diff b/debian/patches/229_udev-fix.diff
new file mode 100644
index 0000000..3b5bf0b
--- /dev/null
+++ b/debian/patches/229_udev-fix.diff
@@ -0,0 +1,33 @@
+for input devices we handle change like remove/add, but for
+drm devices we get change events when we hotplug outputs,
+so lets just ignore change at this level, and let the drivers
+handle it. We may in the future want to route driver udev
+from here instead.
+
+Reported-by: Timo Aaltonen <timo.aaltonen@canonical.com>
+Signed-off-by: Dave Airlie <airlied@redhat.com>
+---
+ config/udev.c | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/config/udev.c b/config/udev.c
+index 03aca28..4a77983 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -300,9 +300,15 @@ wakeup_handler(pointer data, int err, pointer read_mask)
+ return;
+ action = udev_device_get_action(udev_device);
+ if (action) {
+- if (!strcmp(action, "add") || !strcmp(action, "change")) {
++ if (!strcmp(action, "add")) {
+ device_removed(udev_device);
+ device_added(udev_device);
++ } else if (!strcmp(action, "change")) {
++ /* ignore change for the drm devices */
++ if (strcmp(udev_device_get_subsystem(udev_device), "drm")) {
++ device_removed(udev_device);
++ device_added(udev_device);
++ }
+ }
+ else if (!strcmp(action, "remove"))
+ device_removed(udev_device);
commit cd52e2cea04f52d1edb43bfc08e431b5ed3944cd
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Sep 17 15:58:49 2012 +0300
release to quantal
diff --git a/debian/changelog b/debian/changelog
index 1e9f975..48b0ca7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.13.0-0ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.13.0-0ubuntu2) quantal; urgency=low
[ Maarten Lankhorst ]
* Add patch to autobind gpu's
@@ -6,7 +6,7 @@ xorg-server (2:1.13.0-0ubuntu2) UNRELEASED; urgency=low
[ Timo Aaltonen ]
* Add a patch to fix drm device hotplugging.
- -- Maarten Lankhorst <maarten.lankhorst@canonical.com> Fri, 14 Sep 2012 11:29:40 +0200
+ -- Timo Aaltonen <tjaalton@ubuntu.com> Mon, 17 Sep 2012 15:58:32 +0300
xorg-server (2:1.13.0-0ubuntu1) quantal; urgency=low
commit 5415323c0e1c5de7bbfddaa31b3136ab29e4927a
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Mon Sep 17 15:58:20 2012 +0300
Add a patch to fix drm device hotplugging.
diff --git a/debian/changelog b/debian/changelog
index 6f2eca3..1e9f975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
xorg-server (2:1.13.0-0ubuntu2) UNRELEASED; urgency=low
+ [ Maarten Lankhorst ]
* Add patch to autobind gpu's
+ [ Timo Aaltonen ]
+ * Add a patch to fix drm device hotplugging.
+
-- Maarten Lankhorst <maarten.lankhorst@canonical.com> Fri, 14 Sep 2012 11:29:40 +0200
xorg-server (2:1.13.0-0ubuntu1) quantal; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index c81ae16..f5c0b24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@
226_fall_back_to_autoconfiguration.patch
227_null_ptr_midispcur.patch
228_autobind_gpu.patch
+229_udev-fix.diff
# Temporary, until it's reviewed & accepted upstream
500_pointer_barrier_thresholds.diff
Reply to: