xserver: Branch 'master'

[GitLab Mirror]

 config/udev.c |    3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 579eb31222288f256c404648644a2c43b01d73fa
Author: Ivaylo Dimitrov <ivo.g.dimitrov.75 at gmail.com>
Date:   Sun Jan 12 18:54:22 2025 +0200

    linux: Fix BUS_PLATFORM detection for non-PCI devices
    
    Commit 74b7427c41b4 (linux: Make platform device probe less fragile)
    effectively dropped busid detection for non-PCI devices, for example on
    OMAP we have "ID_PATH=platform-omapdrm.0". For such devices busid will not
    be set, making platform probes (and server mediated fd support) impossible.
    
    Fix that by extending config_udev_odev_setup_attribs() logic to support
    platform devices as well.
    
    Signed-off-by: Ivaylo Dimitrov <ivo.g.dimitrov.75 at gmail.com>
    Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1761>

diff --git a/config/udev.c b/config/udev.c
index 83226638d..be317ee99 100644
--- a/config/udev.c
+++ b/config/udev.c
@@ -551,6 +551,9 @@ config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path
 
         attribs->busid = XNFstrdup(value);
         attribs->busid[3] = ':';
+    } else if (value && (str = strrstr(value, "platform-"))) {
+        value = str + 9;
+        attribs->busid = XNFstrdup(value);
     }
 
     if (!value)