Commit e9b10953 authored by Matthew Garrett's avatar Matthew Garrett Committed by Matt Fleming

x86, EFI: Calculate the EFI framebuffer size instead of trusting the firmware

Seth Forshee reported that his system was reporting that the EFI framebuffer
stretched from 0x90010000-0xb0010000 despite the GPU's BAR only covering
0x90000000-0x9ffffff. It's safer to calculate this value from the pixel
stride and screen height (values we already depend on) rather than face
potential problems with resource allocation later on.
Signed-off-by: default avatarMatthew Garrett <mjg@redhat.com>
Tested-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Signed-off-by: default avatarMatt Fleming <matt.fleming@intel.com>
parent f462ed93
...@@ -331,7 +331,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, ...@@ -331,7 +331,6 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
si->lfb_width = width; si->lfb_width = width;
si->lfb_height = height; si->lfb_height = height;
si->lfb_base = fb_base; si->lfb_base = fb_base;
si->lfb_size = fb_size;
si->pages = 1; si->pages = 1;
if (pixel_format == PIXEL_RGB_RESERVED_8BIT_PER_COLOR) { if (pixel_format == PIXEL_RGB_RESERVED_8BIT_PER_COLOR) {
...@@ -379,6 +378,8 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto, ...@@ -379,6 +378,8 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
si->rsvd_pos = 0; si->rsvd_pos = 0;
} }
si->lfb_size = si->lfb_linelength * si->lfb_height;
si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS; si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS;
free_handle: free_handle:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment