Commit graph

2171 commits

Author SHA1 Message Date
Hans de Goede
7cb2eb1489 drm: Limit backend->resources lifetime to within query_device
We do not need / use backend->resources anywhere outside of the query_device
function and with the upcoming hotplug support we need to get a fresh set
of resources on change events, so limit the resources lifetime to
query_device.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 16:57:07 +01:00
Hans de Goede
d68fd78ae1 drm: Store and keep all the outputs in the backend
Put all outputs in the outputs array instead of just the connected ones
and store the outputs array and the controller_id-to-head hashtable in the
backend object instead of temporarily allocating them during enumeration.

Also add new heads to the heads list and to the controller_id-to-head
hashtable in ply_renderer_head_new where this really belongs. This
allows nicely balancing these 2 with removing the head from the list
and hash_table in the ply_renderer_head_remove function which is added
in a follow-up commit.

This is a preparation patch for adding support for hotplugging
monitors while plymouth is running.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 16:56:52 +01:00
Hans de Goede
4ba6d4f4a2 drm: Add get_output_info helper function
Add a new get_output_info helper function, which fill a ply_output_t with
all info related to the connecter based on a connector-id.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:43:00 +01:00
Hans de Goede
b3f1c7683d drm: Stop storing a pointer to drmModeConnector in ply_output_t
This is a preparation patch for hotplug support, for hotplug support we
want to keep the ply_output_t for connectors around, this change decouples
the lifetime of the drmModeConnector from the ply_output_t lifetime.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:43:00 +01:00
Hans de Goede
9b5d4df9f9 drm: Stop keeing a drmModeConnector instance around
Before this commit we were storing a pointer to the drmModeConnector
in struct _ply_renderer_head, solely so that we can free it when
destroying the head. This was necessary because we also stored a pointer
to the mode we picked, which comes from insided the drmModeConnector.

The drmModeModeInfo struct has no pointers, so we can simply store a copy
of it instead of a pointer, which removes the need to keep the
drmModeConnector around after probing the connectors.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:43:00 +01:00
Hans de Goede
80acc33ab3 drm: Refactor ply_renderer_head_add_connector and ply_renderer_head_new
Both these function take a bunch of info coming from the ply_output_t
struct and with upcoming changes they are going to be using even more
ply_output_t fields. Instead of passing all these fields one by one,
simply directly pass a pointer to ply_output_t.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:43:00 +01:00
Hans de Goede
88f1b1dc0e ply-renderer: Add ply_renderer_handle_change_event function
This function can be called to notify the renderer of udev change-events.

This is a preparation patch for adding support for hotplugging
monitors while plymouth is running.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:43:00 +01:00
Hans de Goede
0a6ddf4dc2 ply-array: Add ply_array_contains_uint32_element function
Add a new ply_array_contains_uint32_element which checks if the queried
ply-array contains an element with the passed in uint32_t value.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:43:00 +01:00
Hans de Goede
3497dccf3b Merge branch 'spinner-bgrt-theme-update' into 'master'
Spinner bgrt theme update

See merge request plymouth/plymouth!22
2019-01-16 08:32:25 +00:00
Hans de Goede
203fe586bb themes: Update spinner and bgrt diskcrypt dialog
Update the spinner and bgrt themses diskcrypt dialog to match the dialog
from the "Disk decrypt" mockup from:

https://wiki.gnome.org/Design/OS/BootProgress

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:29:32 +01:00
Hans de Goede
a7ab82171f themes: spinner: Add watermark alignment settings
Add watermark alignment settings, so that distros can simply drop
a watermark.png into the theme dir from another package and then have it
show up in the right place.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:29:32 +01:00
Hans de Goede
ee2025824a themes: bgrt: Remove duplicate images
The bgrt theme is using the exact same images as the spinner theme,
remove these and point ImageDir to the spinner theme dir instead.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:29:32 +01:00
Hans de Goede
6117fe683b plymouth-populate-initrd: Don't assume the ImageDir is the theme-dir
Before this commit plymouth-populate-initrd was only recursively copying the
/usr/share/plymouth/themes/$PLYMOUTH_THEME_NAME to the initrd, assuming
that ImageDir will point there.

This makes it impossible for 2 themes to share their ImageDir, which is
desirable for example for the spinner and bgrt themes, which use the same
images with slightly different settings.

This commit also makes plymouth-populate-initrd also copy the ImageDir
if it is different from the theme-dir, making it possible for ImageDir
to point to a different dir.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-16 09:29:32 +01:00
Hans de Goede
a9aaad0d62 Merge branch 'two-step-dialog-options' into 'master'
Two step dialog options

See merge request plymouth/plymouth!21
2019-01-16 08:28:27 +00:00
Hans de Goede
d62be07815 two-step: Make clearing the dialog-background when using the firmware background optional
Since the ask-for-password or ask-question dialog and the firmware background
may intersect so far we've been clearing the screen to black when showing a
dialog and using the firmware background.

This is not always desirable, this commit adds a new
"DialogClearsFirmwareBackground" option to the two-step based theme config
file, which enables this behavior when set.

The new default is to keep using the initial (firmware) background when
showing a dialog, which matches the non firmware-background paths.

Also update the bgrt theme to use the "DialogClearsFirmwareBackground"
option, keeping the current behavior for that theme.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-09 12:29:42 +01:00
Hans de Goede
27e671bff7 two-step: Add support for non center alignment of the (diskcrypt) dialog
Add DialogHorizontalAlignment and DialogVerticalAlignment options which
allow placing the (diskcrypt) dialog aligned at another place then the
center of the screen.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-09 12:03:55 +01:00
Hans de Goede
410ba63c81 two-step: Make the box image surrounding the unlock dialog optional
In some themes we want a simple style text entry without a dialog like
box around it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-09 12:03:55 +01:00
Hans de Goede
6cf1bb3e37 two-step: Rename UseBGRT to UseFirmwareBackground
Rename the UseBGRT theme configfile option to UseFirmwareBackground,
to make it clear what this does using language which most users will be
able to understand, rather then using the cryptic BGRT ACPI table reference.

While at it also switch to using the new ply_key_file_get_bool function, so
that users can edit an existing configfile with "UseFirmwareBackground=true"
in there and change it to "=false" and actually have that work as expected.

The switch to ply_key_file_get_bool also fixes a memleak as
ply_key_file_get_value returns a strdup-ed value which we were not free-ing.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-09 12:03:55 +01:00
Hans de Goede
e111ba8baf libply: Add ply_key_file_get_bool function
Add a function to read a boolean value from a ply-key-file.

This function will return true if the key exists and it has a value of "1",
"y", "yes" or "true" (case-insensitive). In all other cases it returns
false.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2019-01-09 11:42:34 +01:00
Hans de Goede
c8f12565fb Merge branch 'strtod-locale-fix' into 'master'
Strtod locale fix

See merge request plymouth/plymouth!20
2018-12-19 18:28:37 +00:00
Hans de Goede
fb6d4b4983 two-step: Use plymouth_strtod
Use the locale agnostic plymouth_strtod helper which always uses a "."
as decimal seperator. This fixes the various Alignment options not working
with some locales.

While at it also add a ply_trace to log the size and chosen centering for
the watermark image.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-19 12:37:40 +01:00
Hans de Goede
2dc81adb0f libply: Add ply_strtod helper
Add a ply_strtod helper which always uses "." as decimal separator
independent of the locale.

Using this fixes e.g. HorizontalAlignment in the two-step plugin
not working with some locales.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-19 12:37:40 +01:00
Hans de Goede
f7d5bb122f Merge branch 'ply-keyb-compiler-warning' into 'master'
ply-keyboard: Fix compiler warning

See merge request plymouth/plymouth!18
2018-12-09 14:25:16 +00:00
Hans de Goede
bac628cd05 ply-keyboard: Fix compiler warning
Fix: "warning: enumeration value ‘PLY_KEYBOARD_PROVIDER_TYPE_TERMINAL’
not handled in switch [-Wswitch-enum]" compiler warning.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-09 15:23:21 +01:00
Hans de Goede
5e1adec230 Merge branch 'plugin-iface' into 'master'
When a renderer goes away on a udev remove event, free keyboards associated with the renderer, before freeing the renderer. This avoids a null pointer dereference when ply_device_manager_deactivate_keyboards gets called later on:
https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1794292

See merge request plymouth/plymouth!10
2018-12-09 14:19:08 +00:00
Mathieu Trudel-Lapierre
c46f446fe4 device-manager: free keyboards when deactivating a renderer
Based on an original patch by Gert van de Kraats, on Ubuntu Launchpad bug:
https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1794292

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2018-12-04 15:15:28 -05:00
Mathieu Trudel-Lapierre
b082f42494 keyboard: add helper to get the keyboard's renderer, if applicable
Based on an original patch from Gert van de Kraats on Ubuntu's Launchpad:
https://bugs.launchpad.net/ubuntu/+source/plymouth/+bug/1794292

Signed-off-by: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre@canonical.com>
2018-12-04 15:15:19 -05:00
Hans de Goede
0cd0613759 Merge branch 'drm-pick-crtcs' into 'master'
Drm pick crtcs

See merge request plymouth/plymouth!16
2018-12-04 11:36:54 +00:00
Hans de Goede
d67e729739 drm: Pick a controller for unconfigured connectors
So far we've been relying on the kernel fbcon code to set up all outputs,
now that distros have started using deferred fbcon takeover for flickerfree
booting, we can no longer rely on this and in some cases we must pick
our own controllers.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-04 09:45:52 +01:00
Hans de Goede
76b37d5072 drm: Drop crtcs for clones for which we've picked different modes
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-04 09:44:06 +01:00
Hans de Goede
ef55ed99e7 drm: More connector enumeration refactoring
Some further refactoring to prepare for adding code to picking crtcs
for unconfigured connectors.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-04 09:41:51 +01:00
Hans de Goede
52bf6e3e95 drm: Store tiled and rotation in ply_output_t
This avoids the need to call ply_renderer_connector_get_rotation_and_tiled
twice and thus also the need to call drmModeGetProperty twice for all
properties.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-04 09:41:50 +01:00
Hans de Goede
bf8a2e893e drm: Refactor create_heads_for_active_connectors
Refactor create_heads_for_active_connectors to prepare it for adding a
step where we assign controllers to connected outputs which do not have
a controller assigned yet.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-04 09:41:31 +01:00
Hans de Goede
42bbee8c38 drm: Directly store the mode instead of the mode_index
The only way we use mode_index is to get the mode, so its easier to
directly store the mode when we create a head.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-03 16:52:08 +01:00
Hans de Goede
534aa0cfd5 drm: Drop unused encoder_id
We cache the encoder-id, but we never use it, so stop caching it.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-03 16:52:08 +01:00
Hans de Goede
b24e5f38a4 Merge branch 'two-step-bgrt-upside-down-fix' into 'master'
two-step: Do not rotate bgrt background image for upside-down panels

See merge request plymouth/plymouth!17
2018-12-03 15:51:41 +00:00
Hans de Goede
10fddacd1e two-step: Do not rotate bgrt background image for upside-down panels
Upside-down LCD panels are fixed up in HW by the GOP, so the bgrt image is
not rotated in this case and we should not rotate it to compensate.

While at it also fixup the wrong indentation of the
ply_pixel_buffer_set_device_scale() call.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-12-03 16:50:18 +01:00
Hans de Goede
a7ec3e65ba Merge branch 'bgrt' into 'master'
Add support for using the firmware splash as background for the two-step splash plugin using the ACPI BGRT extension

See merge request plymouth/plymouth!14
2018-11-29 08:40:27 +00:00
Hans de Goede
4925a485c5 themes: Add new BGRT theme, using the firmware boot splash as background
Add a new BGRT theme, this is a copy of the spinner theme, using the ACPI
BGRT graphics (firmware boot splash) as logo when available.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:56:02 +01:00
Hans de Goede
d45c477d44 two-step: bgrt: Deal with quirky firmwares
On laptops / tablets the LCD panel is typically brought up in
its native resolution, so we can trust the x- and y-offset values
provided by the firmware to be correct for a screen with the panels
resolution.

Moreover some laptop / tablet firmwares to do all kind of hacks wrt
the y-offset. This happens especially on devices where the panel is
mounted 90 degrees rotated, but also on other devices.

So on devices with an internal LCD panel, we prefer to use the firmware
provided offsets, to make sure we match its quirky behavior.

We check that the x-offset matches what we expect for the panel's
native resolution to make sure that the values are indeed for the
panel's native resolution and then we correct for any difference
between the (external) screen's and the panel's resolution.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
856297c7a4 two-step: Add ACPI BGRT extension support
Add support to (optionally) use the firmware splash screen logo
from the ACPI BGRT extension as background.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
e10ed13fff two-step: Speed up background-tile drawing on HiDPI screens
Before this commit background drawing on HiDPI screens is quite slow
and CPU intensive, because we do the interpolating scale, which does
a whole bunch of double-precision float operations for *each* pixel
for every frame we draw.

When using two-step with a background-tile on a Cherry Trail machine with
a HiDPI screen this results in the diskcrypt password entry being visible
laggy, I can type the password much faster then the bullets show up.

This also means we are pegging the CPU during boot, significantly slowing
down the boot.

This commit fixes this by creating the background_buffer at the screen's
device_scale and rotation, only doing the scaling once.

This commit further speeds things up by also doing the solid/gradient fill
of the background + the alpha blend of the tiled background-image once,
creating a solid background which allows us to hit the
ply_pixel_buffer_fill_with_buffer memcpy fast-path and avoids the need to
re-do the solid/gradient fill + alpha-blend each frame we render.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
9f3aff2e7c two-step: Use a pixel-buffer instead of an image for the view's background
Use a pixel-buffer instead of an image, this gives us more flexibility.

This is a preparation patch for adding support to (optionally) use
the firmware splash screen logo (from the ACPI BGRT extension) as
background.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
ae8a676c09 ply-pixel-display: Add ply_pixel_display_get_device_scale() function
Add a function to get the device scale for a ply-pixel-display.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
3f71c28e45 ply-pixel-buffer: Add ply_pixel_buffer_rotate_upright helper
For some themes we want to use the firmware-logo / splash as background,
when the LCD panel of a laptop is mounted non-upright then the image which
we get from the firmware will be pre-rotated to match the LCD panel mount.

Until now our device-rotation support was limited to using rotated
pixel_buffer-s as destination / canvas only.

This commit adds a ply_pixel_buffer_rotate_upright helper to rotate
a nop-upright source buffer upright so that we can use it as source-buffer
to other functions which expect source-buffers to always be upright.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
385a008c83 ply-pixel-buffer: Add ply_pixel_buffer_get/set_device_rotation helpers
For some themes we want to use the firmware-logo / splash as background,
when the LCD panel of a laptop is mounted non-upright then the image which
we get from the firmware will be pre-rotated to match the LCD panel mount.

This commit adds ply_pixel_buffer_set/get_device_rotation helpers to
help deal with this.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
e1e9e554d2 ply-pixel-buffer: Fix marking buffers as opaque when doing a solid fill
Instead of comparing fill_area addresses actually compare the contents
of the ply_rectangles.

This allows us to use the memcpy fastpath in ply_pixel_buffer_with_buffer
more often.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
986c911e21 ply-pixel-buffer: Fix fill_with_buffer fastpath when device_scale != 1
After calling ply_pixel_buffer_crop_area_to_clip_area cropped_area.x/y
are in device coordinates. So when calculating the x/y offset in the
source-buffer due to device-clip areas possible making cropped_area.x/y
larger then just the xoffset/yoffset (in the canvas) we must multiply
the original xoffset/yoffset by device_scale before subtracting.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
ed3aae9d8f drm: Implement ply_renderer_get_panel_properties
Implement the get_panel_properties plugin interface.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00
Hans de Goede
1723419e6c ply-renderer: Add ply_renderer_get_panel_properties function
For some themes we want to read the firmware-logo to use as background,
when the LCD panel of a laptop is mounted non-upright and/or if it is
using scaling because of HiDPI then the image which we get from the
firmware will be pre-rotated and scaled to match the LCD panel.

This new function will allow renderers to let themes know about this so
that they can adjust for the logo being pre-rotated and scaled.

Signed-off-by: Hans de Goede <hdegoede@redhat.com>
2018-11-27 08:48:56 +01:00