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

gop: Potential workarounds for modesetting issue

Browse Source
This commit is contained in:
mintsuki 2022-06-01 19:50:27 +02:00
parent ab79b95632
commit cf8f4f86a8
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
common/drivers/gop.c
View File

@ -136,7 +136,9 @@ static bool try_mode(struct fb_info *ret, size_t mode, uint64_t width, uint64_t
#define INVALID_PRESET_MODE 0xffffffff #define INVALID_PRESET_MODE 0xffffffff
static no_unwind size_t preset_mode = INVALID_PRESET_MODE; static no_unwind size_t preset_mode = INVALID_PRESET_MODE;
static no_unwind EFI_GRAPHICS_OUTPUT_MODE_INFORMATION preset_mode_info; static no_unwind size_t preset_mode_width;
static no_unwind size_t preset_mode_height;
static no_unwind size_t preset_mode_bpp;
bool init_gop(struct fb_info *ret, bool init_gop(struct fb_info *ret,
uint64_t target_width, uint64_t target_height, uint16_t target_bpp) { uint64_t target_width, uint64_t target_height, uint16_t target_bpp) {
@ -160,17 +162,23 @@ bool init_gop(struct fb_info *ret,
if (status) { if (status) {
panic(false, "gop: Initialisation failed"); panic(false, "gop: Initialisation failed");
} }
status = gop->QueryMode(gop, gop->Mode == NULL ? 0 : gop->Mode->Mode,
&mode_info_size, &mode_info);
} }
status = gop->QueryMode(gop, gop->Mode->Mode, &mode_info_size, &mode_info);
if (status) { if (status) {
panic(false, "gop: Initialisation failed"); panic(false, "gop: Initialisation failed");
} }
if (preset_mode == INVALID_PRESET_MODE) { if (preset_mode == INVALID_PRESET_MODE) {
preset_mode = gop->Mode->Mode; preset_mode = gop->Mode->Mode;
memcpy(&preset_mode_info, mode_info, mode_info_size); preset_mode_width = mode_info->HorizontalResolution;
preset_mode_height = mode_info->VerticalResolution;
preset_mode_bpp = linear_masks_to_bpp(
mode_info->PixelInformation.RedMask,
mode_info->PixelInformation.GreenMask,
mode_info->PixelInformation.BlueMask,
mode_info->PixelInformation.ReservedMask);
current_video_mode = preset_mode; current_video_mode = preset_mode;
} }
@ -219,8 +227,8 @@ fallback:
edid_width += ((uint64_t)edid_info->det_timing_desc1[4] & 0xf0) << 4; edid_width += ((uint64_t)edid_info->det_timing_desc1[4] & 0xf0) << 4;
uint64_t edid_height = (uint64_t)edid_info->det_timing_desc1[5]; uint64_t edid_height = (uint64_t)edid_info->det_timing_desc1[5];
edid_height += ((uint64_t)edid_info->det_timing_desc1[7] & 0xf0) << 4; edid_height += ((uint64_t)edid_info->det_timing_desc1[7] & 0xf0) << 4;
if (edid_width >= preset_mode_info.HorizontalResolution if (edid_width >= preset_mode_width
&& edid_height >= preset_mode_info.VerticalResolution) { && edid_height >= preset_mode_height) {
target_width = edid_width; target_width = edid_width;
target_height = edid_height; target_height = edid_height;
target_bpp = 32; target_bpp = 32;
@ -232,17 +240,12 @@ fallback:
if (current_fallback == 1) { if (current_fallback == 1) {
current_fallback++; current_fallback++;
uint16_t preset_mode_bpp = linear_masks_to_bpp(preset_mode_info.PixelInformation.RedMask,
preset_mode_info.PixelInformation.GreenMask,
preset_mode_info.PixelInformation.BlueMask,
preset_mode_info.PixelInformation.ReservedMask);
if (preset_mode_bpp == 32 && try_mode(ret, preset_mode, 0, 0, 0)) { if (preset_mode_bpp == 32 && try_mode(ret, preset_mode, 0, 0, 0)) {
gop_force_16 = false; gop_force_16 = false;
return true; return true;
} else { } else {
target_width = preset_mode_info.HorizontalResolution; target_width = preset_mode_width;
target_height = preset_mode_info.VerticalResolution; target_height = preset_mode_height;
target_bpp = 32; target_bpp = 32;
goto retry; goto retry;
} }