diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-19 10:33:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2019-05-19 10:33:26 -0700 |
| commit | 39feaa3ff4453594297574e116a55bd6d5371f37 (patch) | |
| tree | cada824953186c3de35da214101c41fc970e0b6d | |
| parent | 1335d9a1fb2abbe5022de3c517989cc7c7161dee (diff) | |
| parent | f8585539df0a1527c78b5d760665c89fe1c105a9 (diff) | |
| download | linux-39feaa3ff4453594297574e116a55bd6d5371f37.tar.gz linux-39feaa3ff4453594297574e116a55bd6d5371f37.tar.bz2 linux-39feaa3ff4453594297574e116a55bd6d5371f37.zip | |
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
| -rw-r--r-- | drivers/video/fbdev/efifb.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c index 9e529cc2b4ff..9f39f0c360e0 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -477,8 +477,12 @@ static int efifb_probe(struct platform_device *dev) * If the UEFI memory map covers the efifb region, we may only * remap it using the attributes the memory map prescribes. */ - mem_flags |= EFI_MEMORY_WT | EFI_MEMORY_WB; - mem_flags &= md.attribute; + md.attribute &= EFI_MEMORY_UC | EFI_MEMORY_WC | + 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) info->screen_base = ioremap_wc(efifb_fix.smem_start, |