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

Merge branch 'simpledrm-coldplug-fix' into 'main'

Browse source 
ply-device-manager: Also ignore SimpleDRM devs in coldplug enumeration path

See merge request plymouth/plymouth!200
This commit is contained in:
Hans de Goede 2022-10-03 09:10:57 +00:00
commit c09c651afe
1 changed files with 39 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -262,6 +262,40 @@ fb_device_has_drm_device (ply_device_manager_t *manager,
return has_drm_device;
}
static bool
verify_drm_device (struct udev_device *device)
{
const char *id_path;
/*
* Simple-framebuffer devices driven by simpledrm lack information
* like panel-rotation info and physical size, causing the splash
* to briefly render on its side / without HiDPI scaling, switching
* to the correct rendering when the native driver loads.
* To avoid this treat simpledrm devices as fbdev devices and only
* use them after the timeout.
*/
id_path = udev_device_get_property_value (device, "ID_PATH");
if (!ply_string_has_prefix (id_path, "platform-simple-framebuffer"))
return true; /* Not a SimpleDRM device */
/*
* With nomodeset, no native drivers will load, so SimpleDRM devices
* should be used immediately.
*/
if (ply_kernel_command_line_has_argument ("nomodeset"))
return true;
/*
* Some firmwares leave the panel black at boot. Allow enabling SimpleDRM
* use from the cmdline to show something to the user ASAP.
*/
if (ply_kernel_command_line_has_argument ("plymouth.use-simpledrm"))
return true;
return false;
}
static bool
create_devices_for_udev_device (ply_device_manager_t *manager,
struct udev_device *device)
@ -279,6 +313,10 @@ create_devices_for_udev_device (ply_device_manager_t *manager,
ply_trace ("device subsystem is %s", subsystem);
if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
if (!manager->device_timeout_elapsed && !verify_drm_device (device)) {
ply_trace ("ignoring since we only handle SimpleDRM devices after timeout");
return false;
}
ply_trace ("found DRM device %s", device_path);
renderer_type = PLY_RENDERER_TYPE_DRM;
} else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) {
@ -404,40 +442,6 @@ on_drm_udev_add_or_change (ply_device_manager_t *manager,
}
}
static bool
verify_drm_device (struct udev_device *device)
{
const char *id_path;
/*
* Simple-framebuffer devices driven by simpledrm lack information
* like panel-rotation info and physical size, causing the splash
* to briefly render on its side / without HiDPI scaling, switching
* to the correct rendering when the native driver loads.
* To avoid this treat simpledrm devices as fbdev devices and only
* use them after the timeout.
*/
id_path = udev_device_get_property_value (device, "ID_PATH");
if (!ply_string_has_prefix (id_path, "platform-simple-framebuffer"))
return true; /* Not a SimpleDRM device */
/*
* With nomodeset, no native drivers will load, so SimpleDRM devices
* should be used immediately.
*/
if (ply_kernel_command_line_has_argument ("nomodeset"))
return true;
/*
* Some firmwares leave the panel black at boot. Allow enabling SimpleDRM
* use from the cmdline to show something to the user ASAP.
*/
if (ply_kernel_command_line_has_argument ("plymouth.use-simpledrm"))
return true;
return false;
}
static bool
verify_add_or_change (ply_device_manager_t *manager,
const char *action,
@ -458,13 +462,7 @@ verify_add_or_change (ply_device_manager_t *manager,
return true;
subsystem = udev_device_get_subsystem (device);
if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
if (!verify_drm_device (device)) {
ply_trace ("ignoring since we only handle SimpleDRM devices after timeout");
return false;
}
} else {
if (strcmp (subsystem, SUBSYSTEM_DRM)) {
ply_trace ("ignoring since we only handle subsystem %s devices after timeout", subsystem);
return false;
}