aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/boot/compressed
diff options
context:
space:
mode:
authorMatthew Garrett <mjg@redhat.com>2012-07-27 12:58:53 -0400
committerMatt Fleming <matt.fleming@intel.com>2012-09-17 08:29:23 -0400
commitf462ed939de67c20528bc08f11d2fc4f2d59c0d5 (patch)
tree4e1021c98cf298c5c4fc0257cb5999f200d84331 /arch/x86/boot/compressed
parentd6cf86d8f23253225fe2a763d627ecf7dfee9dae (diff)
efifb: Skip DMI checks if the bootloader knows what it's doing
The majority of the DMI checks in efifb are for cases where the bootloader has provided invalid information. However, on some machines the overrides may do more harm than good due to configuration differences between machines with the same machine identifier. It turns out that it's possible for the bootloader to get the correct information on GOP-based systems, but we can't guarantee that the kernel's being booted with one that's been updated to do so. Add support for a capabilities flag that can be set by the bootloader, and skip the DMI checks in that case. Additionally, set this flag in the UEFI stub code. Signed-off-by: Matthew Garrett <mjg@redhat.com> Acked-by: Peter Jones <pjones@redhat.com> Signed-off-by: Matt Fleming <matt.fleming@intel.com>
Diffstat (limited to 'arch/x86/boot/compressed')
-rw-r--r--arch/x86/boot/compressed/eboot.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index d5e4044505d3..bbd83b9cb4da 100644
--- a/arch/x86/boot/compressed/eboot.c
+++ b/arch/x86/boot/compressed/eboot.c
@@ -379,6 +379,8 @@ static efi_status_t setup_gop(struct screen_info *si, efi_guid_t *proto,
379 si->rsvd_pos = 0; 379 si->rsvd_pos = 0;
380 } 380 }
381 381
382 si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS;
383
382free_handle: 384free_handle:
383 efi_call_phys1(sys_table->boottime->free_pool, gop_handle); 385 efi_call_phys1(sys_table->boottime->free_pool, gop_handle);
384 return status; 386 return status;