fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 10:48:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'device-manager-fbdev-add-after-timeout' into 'main'

Browse source 
ply-device-manager: Accept new simpledrm/fbdev devices from udev events after timeout

Closes #167

See merge request plymouth/plymouth!165
This commit is contained in:
Ray Strode 2022-03-07 18:34:10 +00:00
commit 76c1bb6b2f
1 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/libply-splash-core/ply-device-manager.c
View file

@ -450,14 +450,17 @@ verify_add_or_change (ply_device_manager_t *manager,
if (strcmp (action, "add") && strcmp (action, "change"))
return false;
if (manager->local_console_managed && manager->local_console_is_text) {
ply_trace ("ignoring since we're already using text splash for local console");
return false;
}
if (manager->device_timeout_elapsed)
return true;
subsystem = udev_device_get_subsystem (device);
if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
if (manager->local_console_managed && manager->local_console_is_text) {
ply_trace ("ignoring since we're already using text splash for local console");
return false;
}
if (!verify_drm_device (device)) {
ply_trace ("ignoring since we only handle SimpleDRM devices after timeout");
return false;