Modify efi_find_gop_mode() so that passing cols or rows as 0 is
interpreted as a request to attempt to keep the currently set mode,
and do so if the mode query for information is successful and the depth
is supported.
Signed-off-by: Roger Pau Monné <roger....@citrix.com>
---
xen/common/efi/boot.c | 20 ++++++++++++++++++++
1 file changed, 20 insertions(+)
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index 7e8a8b7857..b91a7179a9 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -864,6 +864,26 @@ static UINTN __init
efi_find_gop_mode(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop,
UINTN gop_mode = ~0, info_size, size;
unsigned int i;
+ if ( (!cols || !rows) && gop->Mode->Mode < gop->Mode->MaxMode )
+ {
+ /* If no (valid) resolution suggested, try to use the current mode. */
+ status = gop->QueryMode(gop, gop->Mode->Mode, &info_size, &mode_info);
+ if ( EFI_ERROR(status) )
+ PrintErr(L"Invalid current graphics mode\r\n");
+ else if ( mode_info->PixelFormat < PixelBltOnly )
+ return gop->Mode->Mode;
+ else
+ {
+ /*
+ * Try to find a mode with the same resolution and a valid pixel
+ * format.
+ */
+ cols = mode_info->HorizontalResolution;
+ rows = mode_info->VerticalResolution;
+ depth = 0;
+ }
+ }
+
for ( i = size = 0; i < gop->Mode->MaxMode; ++i )
{
unsigned int bpp = 0;
--
2.37.3
