1 files changed, 5 insertions(+), 1 deletions(-)

M efigop/fix/efiboot.c

@@ 835,6 835,8 @@ efi_makebootargs(void)
 	bios_efiinfo_t		*ei = &bios_efiinfo;
 	int			 curmode;
 	UINTN			 sz, gopsiz, bestsiz = 0;
+	UINTN nhandles;
+	EFI_HANDLE *handles;
 
 	/*
 	 * ACPI, BIOS configuration table


@@ 853,7 855,9 @@ efi_makebootargs(void)
 	/*
 	 * Frame buffer
 	 */
-	status = BS->LocateProtocol(&gop_guid, NULL, (void **)&gop);
+	BS->LocateHandleBuffer(ByProtocol, &gop_guid, NULL, &nhandles, &handles);
+	status = BS->HandleProtocol(handles[1], &gop_guid, (void **)&gop);
+	BS->FreePool(handles);
 	if (!EFI_ERROR(status)) {
 		if (gopmode < 0) {
 			for (i = 0; i < gop->Mode->MaxMode; i++) {