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>

diff --git a/arch/x86/boot/compressed/eboot.c b/arch/x86/boot/compressed/eboot.c
index d5e4044505d3ea69f307ce1a11c6f9a02f0dda93..bbd83b9cb4dad29e36632dd7395f4992be4dea74 100644 (file)
--- 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,
                si->rsvd_pos = 0;
        }
 
+       si->capabilities |= VIDEO_CAPABILITY_SKIP_QUIRKS;
+
 free_handle:
        efi_call_phys1(sys_table->boottime->free_pool, gop_handle);
        return status;

diff --git a/drivers/video/efifb.c b/drivers/video/efifb.c
index b4a632ada40172574ae9aca1ad6836d632ce4e1c..932abaa58a89af3bc63f03fc3a2f80c078b3eeaa 100644 (file)
--- a/drivers/video/efifb.c
+++ b/drivers/video/efifb.c
@@ -553,7 +553,9 @@ static int __init efifb_init(void)
        int ret;
        char *option = NULL;
 
-       dmi_check_system(dmi_system_table);
+       if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI ||
+           !(screen_info.capabilities & VIDEO_CAPABILITY_SKIP_QUIRKS))
+               dmi_check_system(dmi_system_table);
 
        if (screen_info.orig_video_isVGA != VIDEO_TYPE_EFI)
                return -ENODEV;

diff --git a/include/linux/screen_info.h b/include/linux/screen_info.h
index 899fbb487c94e5cb2385ff90ab86f0b8985aa435..fb3c5a8fef3db5712fccfda96b9e44b9112da1d5 100644 (file)
--- a/include/linux/screen_info.h
+++ b/include/linux/screen_info.h
@@ -68,6 +68,8 @@ struct screen_info {
 
 #define VIDEO_FLAGS_NOCURSOR   (1 << 0) /* The video mode has no cursor set */
 
+#define VIDEO_CAPABILITY_SKIP_QUIRKS   (1 << 0)
+
 #ifdef __KERNEL__
 extern struct screen_info screen_info;