diff options
| author | Adam Jackson <ajax@redhat.com> | 2018-09-18 14:37:51 -0400 |
|---|---|---|
| committer | Adam Jackson <ajax@redhat.com> | 2018-10-18 13:52:11 -0400 |
| commit | 0816e8fca6194dfb4cc94c3a7fcb2c7f2a921386 (patch) | |
| tree | 908989a06a5e38e67217471856e262a043bcb299 /config | |
| parent | 71703e4e8bd00719eefad53c2ed6c604079f87ea (diff) | |
linux: Make platform device probe less fragile
At the point where xf86BusProbe runs we haven't yet taken our own VT,
which means we can't perform drm "master" operations on the device. This
is tragic, because we need master to fish the bus id string out of the
kernel, which we can only do after drmSetInterfaceVersion, which for
some reason stores that string on the device not the file handle and
thus needs master access.
Fortunately we know the format of the busid string, and it happens to
almost be the same as the ID_PATH variable from udev. Use that instead
and stop calling drmSetInterfaceVersion.
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'config')
| -rw-r--r-- | config/udev.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/config/udev.c b/config/udev.c index 3a73189e2..8c6c4b666 100644 --- a/config/udev.c +++ b/config/udev.c @@ -56,7 +56,7 @@ static struct udev_monitor *udev_monitor; #ifdef CONFIG_UDEV_KMS static void -config_udev_odev_setup_attribs(const char *path, const char *syspath, +config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback); #endif @@ -128,7 +128,7 @@ device_added(struct udev_device *udev_device) LogMessage(X_INFO, "config/udev: Adding drm device (%s)\n", path); - config_udev_odev_setup_attribs(path, syspath, major(devnum), + config_udev_odev_setup_attribs(udev_device, path, syspath, major(devnum), minor(devnum), NewGPUDeviceRequest); return; } @@ -322,7 +322,7 @@ device_removed(struct udev_device *device) LogMessage(X_INFO, "config/udev: removing GPU device %s %s\n", syspath, path); - config_udev_odev_setup_attribs(path, syspath, major(devnum), + config_udev_odev_setup_attribs(device, path, syspath, major(devnum), minor(devnum), DeleteGPUDeviceRequest); /* Retry vtenter after a drm node removal */ systemd_logind_vtenter(); @@ -465,17 +465,24 @@ config_udev_fini(void) #ifdef CONFIG_UDEV_KMS static void -config_udev_odev_setup_attribs(const char *path, const char *syspath, +config_udev_odev_setup_attribs(struct udev_device *udev_device, const char *path, const char *syspath, int major, int minor, config_odev_probe_proc_ptr probe_callback) { struct OdevAttributes *attribs = config_odev_allocate_attributes(); + const char *value; attribs->path = XNFstrdup(path); attribs->syspath = XNFstrdup(syspath); attribs->major = major; attribs->minor = minor; + value = udev_device_get_property_value(udev_device, "ID_PATH"); + if (value && !strncmp(value, "pci-", 4)) { + attribs->busid = XNFstrdup(value); + attribs->busid[3] = ':'; + } + /* ownership of attribs is passed to probe layer */ probe_callback(attribs); } @@ -516,7 +523,7 @@ config_udev_odev_probe(config_odev_probe_proc_ptr probe_callback) else if (!check_seat(udev_device)) goto no_probe; - config_udev_odev_setup_attribs(path, syspath, major(devnum), + config_udev_odev_setup_attribs(udev_device, path, syspath, major(devnum), minor(devnum), probe_callback); no_probe: udev_device_unref(udev_device); |