Aren/rulimine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gop: Remove ConOut logic

Browse Source
This commit is contained in:
mintsuki 2022-11-15 06:39:55 +01:00
parent 5c903dc5bf
commit 74fbf5276c
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
common/drivers/gop.c
View File

@ -193,19 +193,6 @@ bool init_gop(struct fb_info *ret,
UINTN handles_size = sizeof(EFI_HANDLE); UINTN handles_size = sizeof(EFI_HANDLE);
EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
bool using_conout = true;
status = gBS->HandleProtocol(gST->ConsoleOutHandle, &gop_guid, (void **)&gop);
if (status == EFI_SUCCESS) {
print("gop: ConOut provides GOP. Using that...\n");
gop_handle = gST->ConsoleOutHandle;
goto conout_gop;
}
no_conout:
{
using_conout = false;
status = gBS->LocateHandle(ByProtocol, &gop_guid, NULL, &handles_size, handles); status = gBS->LocateHandle(ByProtocol, &gop_guid, NULL, &handles_size, handles);
if (status != EFI_SUCCESS && status != EFI_BUFFER_TOO_SMALL) { if (status != EFI_SUCCESS && status != EFI_BUFFER_TOO_SMALL) {
@ -227,9 +214,7 @@ no_conout:
if (status != EFI_SUCCESS) { if (status != EFI_SUCCESS) {
return false; return false;
} }
}
conout_gop:;
gop_ready = true; gop_ready = true;
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
@ -331,9 +316,6 @@ fallback:
} }
gop_force_16 = false; gop_force_16 = false;
if (using_conout) {
goto no_conout;
}
return false; return false;
} }