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 typeshifive-unleashed-5.2
commit
39feaa3ff4
|
@ -477,8 +477,12 @@ static int efifb_probe(struct platform_device *dev)
|
||||||
* If the UEFI memory map covers the efifb region, we may only
|
* If the UEFI memory map covers the efifb region, we may only
|
||||||
* remap it using the attributes the memory map prescribes.
|
* remap it using the attributes the memory map prescribes.
|
||||||
*/
|
*/
|
||||||
mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB;
|
md.attribute &= EFI_MEMORY_UC | EFI_MEMORY_WC |
|
||||||
mem_flags &= md.attribute;
|
EFI_MEMORY_WT | EFI_MEMORY_WB;
|
||||||
|
if (md.attribute) {
|
||||||
|
mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB;
|
||||||
|
mem_flags &= md.attribute;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (mem_flags & EFI_MEMORY_WC)
|
if (mem_flags & EFI_MEMORY_WC)
|
||||||
info->screen_base = ioremap_wc(efifb_fix.smem_start,
|
info->screen_base = ioremap_wc(efifb_fix.smem_start,
|
||||||
|
|
Loading…
Reference in New Issue