tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge branch 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull EFI fix from Ingo Molnar:
"Fix an EFI-fb regression that affects certain x86 systems"

* 'efi-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
fbdev/efifb: Ignore framebuffer memmap entries that lack any memory types

Linus Torvalds 39feaa3f 1335d9a1

+6 -2
unified split
+6 -2
drivers/video/fbdev/efifb.c
··· 477 * If the UEFI memory map covers the efifb region, we may only 478 * remap it using the attributes the memory map prescribes. 479 */ 480 - mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB; 481 - mem_flags &= md.attribute; 482 } 483 if (mem_flags & EFI_MEMORY_WC) 484 info->screen_base = ioremap_wc(efifb_fix.smem_start,
··· 477 * If the UEFI memory map covers the efifb region, we may only 478 * remap it using the attributes the memory map prescribes. 479 */ 480 + md.attribute &= EFI_MEMORY_UC | EFI_MEMORY_WC | 481 + EFI_MEMORY_WT | EFI_MEMORY_WB; 482 + if (md.attribute) { 483 + mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB; 484 + mem_flags &= md.attribute; 485 + } 486 } 487 if (mem_flags & EFI_MEMORY_WC) 488 info->screen_base = ioremap_wc(efifb_fix.smem_start,