The libply-splash-core library provides functions for controlling the
input and output of the splash screen.
Recently it gained support for device enumeration from udev using the
libudev library. When that support was added, the linker and compiler
flags of the plymouthd binary were augmented, instead of the the
libply-splash-core library directly. That broke the build on some
systems.
This commit moves the linker and compiler flags to the correct place.
We watch for udev events even after forcing fall back, so we need to
make sure we don't allocate two seats for the local console if we
fallback then get a late event.
Recently, loading a splash was separated from showing the
splash. This ends up breaking fall back to the text splash,
because we don't know if we need to fall back until after
the default splash fails to show.
This commit recombines loading with showing.
Right now, we'll wait indefinitely for graphics devices to show up
before showing the splash screen.
This means text splashes don't get shown, at all.
This commit changes the initial scan for graphics devices, to
include uninitialized ones. If there aren't any, then we fall
back. If there are some, we know an add event will be coming, so
we don't fall back. We still handle already initialized devices
right away.
We need to make sure udevd is started before plymouthd since we
need to know that "queue is empty" means "coldplug complete" not
"coldplug hasn't started yet".
A certain class of machines don't work in plymouth because
they draw the kernel console to /dev/dri/card1 instead of
/dev/dri/card2.
This branch fixes that, by adding support for querying udev
to determine the available drm devices.
As part of this effort, some clean up was performed:
1) a bunch of bit rotted tests were removed
2) large chunks of code were moved from main.c to helper
objects implemented in other files.
3) Other parts of main.c were moved around or refactored
so they were easier to read.
Based on work from Kevin Murphy <kemurphy.cmu@gmail.com>
https://bugs.freedesktop.org/show_bug.cgi?id=25943
Since we're monitoring udev explicitly now, we have no
need to block the client show-splash request until graphics
devices settle.
This commit removes the udevadm calls from plymouth-start.service.
We don't want to use udev for device enumeration if:
1) DISPLAY is set (since we're going to use the X11 renderer)
2) if it's disabled explicitly on the kernel command line
This commit adds support for those two things.
At the moment, we hardcode /dev/dri/card0 for the DRM device.
This works well enough in the lion's share of cases, but there are cases
where it falls over. Namely, machines with multiple GPUs, such as
optimus hardware, sometimes end up with the kernel fb console going to
/dev/dri/card1.
Rather than trying /dev/dri/card0 then /dev/dri/card1 etc in succession,
this commit, instead, adds support for querying udev for the
information.
It's useful to be able to figure out which renderer a given renderer
is, by examining the device that is associated with it.
This commit adds and accessor function to return the device that
was passed to ply_renderer_new.
At the moment, it does not return the device name if NULL was passed
to the constructor and the device was figured out automatically. A
future commit may add that ability if it becomes necessary.
We're going to want to support multiple graphics devices, as
specified by udev.
This first commit, merely adds the libudev dependency to the
build goo.
If there are multiple DRM devices, only one
can really be reading from the terminal at a time.
We currently punt this issue by ignoring all but
the first drm device.
In preparation for supporting more than one DRM device,
we need to come up with a solution.
This commit changes the DRM renderer plugin to allow getting
a NULL terminal. In this way, we can assign the terminal to
one of the DRM cards, but still output to the others.
Note, we never pass NULL for a terminal yet, that comes later.
Now that we have a class for managing our seats, let's use it.
This gets a lot of the nitty gritty logic out of main.c and
paves the way for us to do smartcard device management going
forward.
There's quite a bit of logic for managing input and output in
main.c right now. That code is already a bit too complicated,
but will get even more complicated going forward if we want
to add udev support, etc.
In an effort to keep things from getting too unwieldly, this
commit breaks out a lot of the logic into a new
ply-device-manager class.
A subsequent commit will make main.c use the new class.
Everywhere we call show_theme we call show_messages immediately,
afterward.
Since showing the messages on the theme is arguable part of showing
it, this commit moves show_messages into the show_theme function.
Right now show_default_splash and show_detailed_splash,
load the relevant splash and then show it.
This commit drops the "show" part and renames the functions to
load_default_splash and load_detailed_splash, respectively.
It, of course, also updates the callers to call show_theme
explicitly.
This refactorization will make it easier to later move device
management out of main.c
Now that main.c is attaching seat objects to the boot splash,
instead of the seat's individual components, we can drop the
apis that allow doing things piecewise.
ply_boot_splash_t currently gets notified about displays and keyboard
objects to pass along to the splash plugins.
Now that we have a ply_seat_t object that can encapsulate display
and keyboard objects, we should add support to ply_boot_splash_t for
using it.
This commit does that. For now, it does it without changing the plugin
interface (which is still in terms of displays and keyboards).
Note, this commit only adds support for seat objects to
ply_boot_splash_t. It doesn't actually change any of the calling code
to use that support. That will come in a subsequent commit.
Right now we maintain parallel lists of displays in several different
layers of code.
This commit introduces a "seat" object to encapsulate a set of displays,
and associated input device.
A subsequently commit will actually change the code over to use the
seat object.
start_boot_splash is a convenience function that's going to
get in the way in the future. It also has the annoying
"boolean argument" problem that load_theme had.
This commit gets rid of start_boot_splash entirely.
load_theme currently takes a boolean that if true, will
make it load the built-in "details" plugin if the main plugin
fails to load.
Boolean arguments are hard to read, so this commit drops it.
We already have the details theme "built" in, so there's
little point in loading the details.so plugin when we want
details internally.
This commit fixes that.
Right now start_boot_splash loads the theme, then
shows it.
It's going to be useful in the future to preload the
theme, so this commit breaks the two operations out
into two functions, load_theme and show_theme,
and makes start_boot_splash just call those two
functions.
This commit drops the aging fallback code for when
/sys/class/tty/console/active is unavailable.
This should have no impact for people running recent kernels, and
minimal impact for people running old kernels.
Now that debugging keybindings are gone, ply-boot-splash is really
just a wrapper around splash plugins. As such, it doesn't really
make sense to be mucking with terminal objects from it.
This commit moves that mucking to main until I can find a better
destination for it.
The boot splash currently lets the user hit ctrl-L to refresh,
ctrl-T to force text mode, and ctrl-V to toggle verbose messages.
These easter eggs are undocumented and really only used when I
was first writing plymouth.
These days it's just taking up space, so drop it.
Currently terminals are created in the main file and passed
down to other layers, with no direct reference maintained in
the main file.
There are points when we need to get references to all those
terminals again, and we have to fish them out from other layers.
This commit makes it all more explicit, maintaining the terminals
in a hash table in the main state object.
Right now there's no easy way to know if a hash table is empty,
which I'm going to need in a future commit.
This commit adds a get_size method to return the number of items in
the hash table.
The name is passed in at construct time, but it gets canonicalized.
This commit adds api to get the final name. The api is also useful,
since it prevents callers that need the mapping from having to maintain
it separately, which will be good for a future clean up.
ply_renderer_new takes a path to a renderer plugin, or NULL to
try each one in turn.
It's cleaner to abstract the path behind an enum type, so this
commit makes that change.
Now it will be possible to instantiate specific renderers without
hardcoding the paths to plugins in more than one place.
both the default tty and whether or not displays should be added
are available in the global state object (as state->default_tty
and state->is_shown respectively), so they don't need to be parameters.
The latter one was a boolean, so having it as a parameter was confusing
at the call sites.
This commit drops the parameters.
libdrm's open functions are just wrappers around open(), and our
detection of which parameter to pass to drmOpen() is not 100%
reliable.
Simplify the code and just call open() directly.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=71590
The previous commit introduced a bug where the unlock screen won't
get shown if it's requested within the first 5 seconds of startup.
This commit fixes that by forcing a redraw if the state switches from
NORMAL.
Many machines these days can boot in 5 seconds or less.
In those cases, there's little point in showing a boot splash.
This commit introduces a StartupDelay option to the two step
plugin to prevent it from displaying anything for a few seconds.
