diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-16 09:44:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2018-08-16 09:44:16 +0200 |
commit | d7fe7dc07db546e66bedfc129f571d461ab7f318 (patch) | |
tree | 41be85dc81da51193419688d47d698522c82dcf8 /0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch | |
parent | bb25498a748ab7113c4899eadbf077e9cc67bb42 (diff) | |
parent | bec265804e1fd3a597c830846bf5efb43ebfa165 (diff) | |
download | kernel-4.19.0-0.rc0.git2.1.vanilla.knurd.1.fc28.tar.gz kernel-4.19.0-0.rc0.git2.1.vanilla.knurd.1.fc28.tar.xz kernel-4.19.0-0.rc0.git2.1.vanilla.knurd.1.fc28.zip |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-4.19.0-0.rc0.git2.1.vanilla.knurd.1.fc28
Diffstat (limited to '0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch')
-rw-r--r-- | 0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch b/0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch index 706c2f3c8..248b34335 100644 --- a/0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch +++ b/0006-efifb-Copy-the-ACPI-BGRT-boot-graphics-to-the-frameb.patch @@ -22,7 +22,7 @@ Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com> 1 file changed, 140 insertions(+) diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c -index 46a4484e3da7..fa01eecc0a55 100644 +index c6f78d27947b..67684412ba8a 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -9,16 +9,39 @@ @@ -63,7 +63,7 @@ index 46a4484e3da7..fa01eecc0a55 100644 +} __packed; + static bool request_mem_succeeded = false; - static bool nowc = false; + static u64 mem_flags = EFI_MEMORY_WC | EFI_MEMORY_UC; @@ -66,6 +89,121 @@ static int efifb_setcolreg(unsigned regno, unsigned red, unsigned green, return 0; @@ -186,8 +186,8 @@ index 46a4484e3da7..fa01eecc0a55 100644 + static void efifb_destroy(struct fb_info *info) { - if (info->screen_base) -@@ -283,6 +421,8 @@ static int efifb_probe(struct platform_device *dev) + if (info->screen_base) { +@@ -311,6 +449,8 @@ static int efifb_probe(struct platform_device *dev) goto err_release_fb; } |