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

gop: Use LocateHandle/HandleProtocol to get GOP instance

This commit is contained in:
mintsuki 2022-07-01 13:08:08 +02:00
parent 55199478db
commit 29d63d6b3e
2 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/drivers/edid.c
View File

@ -80,7 +80,7 @@ struct edid_info_struct *get_edid_info(void) {
if (status) if (status)
goto fail; goto fail;
if (edid->SizeOfEdid < sizeof(struct edid_info_struct)) if (edid->SizeOfEdid != sizeof(struct edid_info_struct))
goto fail; goto fail;
memcpy(buf, edid->Edid, sizeof(struct edid_info_struct)); memcpy(buf, edid->Edid, sizeof(struct edid_info_struct));

42
common/drivers/gop.c
View File

@ -1,11 +1,14 @@
#if uefi == 1 #if uefi == 1
#include <stdint.h>
#include <stddef.h>
#include <efi.h> #include <efi.h>
#include <lib/blib.h> #include <lib/blib.h>
#include <lib/term.h> #include <lib/term.h>
#include <drivers/gop.h> #include <drivers/gop.h>
#include <drivers/edid.h> #include <drivers/edid.h>
#include <lib/print.h> #include <lib/print.h>
#include <mm/pmm.h>
static uint16_t linear_masks_to_bpp(uint32_t red_mask, uint32_t green_mask, static uint16_t linear_masks_to_bpp(uint32_t red_mask, uint32_t green_mask,
uint32_t blue_mask, uint32_t alpha_mask) { uint32_t blue_mask, uint32_t alpha_mask) {
@ -36,14 +39,10 @@ static void linear_mask_to_mask_shift(
bool gop_force_16 = false; bool gop_force_16 = false;
static bool try_mode(struct fb_info *ret, size_t mode, uint64_t width, uint64_t height, int bpp) { static bool try_mode(EFI_GRAPHICS_OUTPUT_PROTOCOL *gop,
struct fb_info *ret, size_t mode, uint64_t width, uint64_t height, int bpp) {
EFI_STATUS status; EFI_STATUS status;
EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
gBS->LocateProtocol(&gop_guid, NULL, (void **)&gop);
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
UINTN mode_info_size; UINTN mode_info_size;
@ -144,10 +143,35 @@ bool init_gop(struct fb_info *ret,
EFI_STATUS status; EFI_STATUS status;
EFI_HANDLE tmp_handles[1];
EFI_HANDLE *handles = tmp_handles;
UINTN handles_size = sizeof(EFI_HANDLE);
EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID; EFI_GUID gop_guid = EFI_GRAPHICS_OUTPUT_PROTOCOL_GUID;
status = gBS->LocateHandle(ByProtocol, &gop_guid, NULL, &handles_size, handles);
if (status != EFI_SUCCESS && status != EFI_BUFFER_TOO_SMALL) {
return false;
}
handles = ext_mem_alloc(handles_size);
status = gBS->LocateHandle(ByProtocol, &gop_guid, NULL, &handles_size, handles);
if (status != EFI_SUCCESS) {
pmm_free(handles, handles_size);
return false;
}
EFI_HANDLE gop_handle = handles[0];
pmm_free(handles, handles_size);
EFI_GRAPHICS_OUTPUT_PROTOCOL *gop; EFI_GRAPHICS_OUTPUT_PROTOCOL *gop;
gBS->LocateProtocol(&gop_guid, NULL, (void **)&gop); status = gBS->HandleProtocol(gop_handle, &gop_guid, (void **)&gop);
if (status != EFI_SUCCESS) {
return false;
}
EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info; EFI_GRAPHICS_OUTPUT_MODE_INFORMATION *mode_info;
UINTN mode_info_size; UINTN mode_info_size;
@ -201,7 +225,7 @@ bool init_gop(struct fb_info *ret,
retry: retry:
for (size_t i = 0; i < modes_count; i++) { for (size_t i = 0; i < modes_count; i++) {
if (try_mode(ret, i, target_width, target_height, target_bpp)) { if (try_mode(gop, ret, i, target_width, target_height, target_bpp)) {
gop_force_16 = false; gop_force_16 = false;
return true; return true;
} }
@ -232,7 +256,7 @@ fallback:
if (current_fallback == 1) { if (current_fallback == 1) {
current_fallback++; current_fallback++;
if (try_mode(ret, preset_mode, 0, 0, 0)) { if (try_mode(gop, ret, preset_mode, 0, 0, 0)) {
gop_force_16 = false; gop_force_16 = false;
return true; return true;
} }