From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 21 Sep 2021 17:33:01 +0000 (+0200)
Subject: stub: show splash screen earlier
X-Git-Tag: v250-rc1~629^2~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=94b81afb08e35b44cb15479a0122e4f3c2c88235;p=thirdparty%2Fsystemd.git

stub: show splash screen earlier

let's move showing of the splash screen to the earliest place we know
the splash bmp address. After all a splash screen is all about showing
as early as we can. This matters as doing TPM stuff or packing up a
large cpio might take time.

While we are at it, move the conditionalization of the splash screen
into the function instead of doing it ahead of calling it. This should
encapsulate things more nicely.
---

diff --git a/src/boot/efi/splash.c b/src/boot/efi/splash.c
index 0286a5a9064..bbc15176758 100644
--- a/src/boot/efi/splash.c
+++ b/src/boot/efi/splash.c
@@ -259,6 +259,9 @@ EFI_STATUS graphics_splash(UINT8 *content, UINTN len, const EFI_GRAPHICS_OUTPUT_
         UINTN y_pos = 0;
         EFI_STATUS err;
 
+        if (len == 0)
+                return EFI_SUCCESS;
+
         assert(content);
 
         if (!background) {
diff --git a/src/boot/efi/stub.c b/src/boot/efi/stub.c
index f8f3e3662fc..23f558c885e 100644
--- a/src/boot/efi/stub.c
+++ b/src/boot/efi/stub.c
@@ -172,6 +172,9 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
         if (EFI_ERROR(err))
                 return log_error_status_stall(err, L"Unable to locate embedded .linux section: %r", err);
 
+        /* Show splash screen as early as possible */
+        graphics_splash((UINT8*) loaded_image->ImageBase + addrs[SECTION_SPLASH], szs[SECTION_SPLASH], NULL);
+
         if (szs[SECTION_CMDLINE] > 0) {
                 cmdline = (CHAR8*) loaded_image->ImageBase + addrs[SECTION_CMDLINE];
                 cmdline_len = szs[SECTION_CMDLINE];
@@ -201,9 +204,6 @@ EFI_STATUS efi_main(EFI_HANDLE image, EFI_SYSTEM_TABLE *sys_table) {
 
         export_variables(loaded_image);
 
-        if (szs[SECTION_SPLASH] > 0)
-                graphics_splash((UINT8*) (UINTN) loaded_image->ImageBase + addrs[SECTION_SPLASH], szs[SECTION_SPLASH], NULL);
-
         (VOID) pack_cpio(loaded_image,
                          L".cred",
                          (const CHAR8*) ".extra/credentials",