[xorg-x11-server/f20] Search all parent devices for a PnPID.

[Peter Hutterer]

commit 37d49a870be5894ba9d9f6c19762269d2b41b951
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Feb 28 13:26:05 2014 +1000

    Search all parent devices for a PnPID.

 ...fig-search-for-PnPID-on-all-parents-75513.patch |   86 ++++++++++++++++++++
 xorg-x11-server.spec                               |    7 ++-
 2 files changed, 92 insertions(+), 1 deletions(-)
---
diff --git a/0001-config-search-for-PnPID-on-all-parents-75513.patch b/0001-config-search-for-PnPID-on-all-parents-75513.patch
new file mode 100644
index 0000000..fed7342
--- /dev/null
+++ b/0001-config-search-for-PnPID-on-all-parents-75513.patch
@@ -0,0 +1,86 @@
+From 332f709a2a6c8839e953335b957604491d580512 Mon Sep 17 00:00:00 2001
+From: Peter Hutterer <peter.hutterer at who-t.net>
+Date: Wed, 26 Feb 2014 07:54:56 +1000
+Subject: [PATCH] config: search for PnPID on all parents (#75513)
+
+The PnPID for a device may not be on the immediate parent, so search up the
+device tree until we find one.
+
+X.Org Bug 75513 <http://bugs.freedesktop.org/show_bug.cgi?id=75513>
+
+Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
+---
+ config/hal.c  | 16 +++++++++++++---
+ config/udev.c | 15 +++++++++++----
+ 2 files changed, 24 insertions(+), 7 deletions(-)
+
+diff --git a/config/hal.c b/config/hal.c
+index 2ead556..d8e8db7 100644
+--- a/config/hal.c
++++ b/config/hal.c
+@@ -184,8 +184,7 @@ device_added(LibHalContext * hal_ctx, const char *udi)
+     parent = get_prop_string(hal_ctx, udi, "info.parent");
+     if (parent) {
+         int usb_vendor, usb_product;
+-
+-        attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id");
++        char *old_parent;
+ 
+         /* construct USB ID in lowercase - "0000:ffff" */
+         usb_vendor = libhal_device_get_property_int(hal_ctx, parent,
+@@ -203,7 +202,18 @@ device_added(LibHalContext * hal_ctx, const char *udi)
+                 == -1)
+                 attrs.usb_id = NULL;
+ 
+-        free(parent);
++        attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id");
++        old_parent = parent;
++
++        while (!attrs.pnp_id &&
++               (parent = get_prop_string(hal_ctx, parent, "info.parent"))) {
++            attrs.pnp_id = get_prop_string(hal_ctx, parent, "pnp.id");
++
++            free(old_parent);
++            old_parent = parent;
++        }
++
++        free(old_parent);
+     }
+ 
+     input_options = input_option_new(NULL, "_source", "server/hal");
+diff --git a/config/udev.c b/config/udev.c
+index de89241..2ae944d 100644
+--- a/config/udev.c
++++ b/config/udev.c
+@@ -130,10 +130,6 @@ device_added(struct udev_device *udev_device)
+             LOG_PROPERTY(ppath, "NAME", name);
+         }
+ 
+-        if (pnp_id)
+-            attrs.pnp_id = strdup(pnp_id);
+-        LOG_SYSATTR(ppath, "id", pnp_id);
+-
+         /* construct USB ID in lowercase hex - "0000:ffff" */
+         if (product &&
+             sscanf(product, "%*x/%4x/%4x/%*x", &usb_vendor, &usb_model) == 2) {
+@@ -143,6 +139,17 @@ device_added(struct udev_device *udev_device)
+             else
+                 LOG_PROPERTY(ppath, "PRODUCT", product);
+         }
++
++        while (!pnp_id && (parent = udev_device_get_parent(parent))) {
++            pnp_id = udev_device_get_sysattr_value(parent, "id");
++            if (!pnp_id)
++                continue;
++
++            attrs.pnp_id = strdup(pnp_id);
++            ppath = udev_device_get_devnode(parent);
++            LOG_SYSATTR(ppath, "id", pnp_id);
++        }
++
+     }
+     if (!name)
+         name = "(unnamed)";
+-- 
+1.8.4.2
+
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 8411bfd..1c5b2db 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -42,7 +42,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.14.4
-Release:   6%{?gitdate:.%{gitdate}}%{dist}
+Release:   7%{?gitdate:.%{gitdate}}%{dist}
 URL:       http://www.x.org
 License:   MIT
 Group:     User Interface/X
@@ -173,6 +173,8 @@ Patch9050: 0001-xfree86-Prefer-fbdev-to-vesa.patch
 # in pull request http://patchwork.freedesktop.org/patch/19468/
 Patch9051: 0001-dix-fix-button-state-check-before-changing-a-button-.patch
 
+Patch9052: 0001-config-search-for-PnPID-on-all-parents-75513.patch
+
 %global moduledir	%{_libdir}/xorg/modules
 %global drimoduledir	%{_libdir}/dri
 %global sdkdir		%{_includedir}/xorg
@@ -651,6 +653,9 @@ rm -rf $RPM_BUILD_ROOT
 %{xserver_source_dir}
 
 %changelog
+* Fri Feb 28 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.14.4-7
+- Search all parent devices for a PnPID.
+
 * Wed Feb 05 2014 Peter Hutterer <peter.hutterer at redhat.com> 1.14.4-6
 - Prevent out-of-bounds access in check_butmap_change (#1061466)