diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-15 10:57:21 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-06-15 10:57:21 -0400 |
| commit | bd2a93872ba42335f203e472f6ee1f0cc9a17641 (patch) | |
| tree | 5a0c4bf4f2d6b7cc0ab0aef4126c708c159dc1ab | |
| parent | 4c4e393bddcc965a8614d9c2292e92583d69ddfa (diff) | |
| download | longterm-queue-4.8-bd2a93872ba42335f203e472f6ee1f0cc9a17641.tar.gz | |
efi/fb: trivial refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch b/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch index ae95bfb..40f0af1 100644 --- a/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch +++ b/queue/efi-fb-Avoid-reconfiguration-of-BAR-that-covers-the-.patch @@ -1,4 +1,4 @@ -From 55d728a40d368ba80443be85c02e641fc9082a3f Mon Sep 17 00:00:00 2001 +From 8330c6ed1ad205f29cd7d6ffbd6455bdc8fd66a4 Mon Sep 17 00:00:00 2001 From: Ard Biesheuvel <ard.biesheuvel@linaro.org> Date: Tue, 4 Apr 2017 16:27:44 +0100 Subject: [PATCH] efi/fb: Avoid reconfiguration of BAR that covers the @@ -35,9 +35,10 @@ Cc: lorenzo.pieralisi@arm.com Fixes: 9822504c1fa5 ("efifb: Enable the efi-framebuffer platform driver ...") Link: http://lkml.kernel.org/r/20170404152744.26687-3-ard.biesheuvel@linaro.org Signed-off-by: Ingo Molnar <mingo@kernel.org> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/drivers/video/fbdev/efifb.c b/drivers/video/fbdev/efifb.c -index 8c4dc1e1f94f..b827a8113e26 100644 +index 37a37c4d04cb..6f2e729a308f 100644 --- a/drivers/video/fbdev/efifb.c +++ b/drivers/video/fbdev/efifb.c @@ -10,6 +10,7 @@ @@ -48,16 +49,16 @@ index 8c4dc1e1f94f..b827a8113e26 100644 #include <linux/platform_device.h> #include <linux/screen_info.h> #include <video/vga.h> -@@ -143,6 +144,8 @@ static struct attribute *efifb_attrs[] = { - }; - ATTRIBUTE_GROUPS(efifb); +@@ -118,6 +119,8 @@ static inline bool fb_base_is_valid(void) + return false; + } +static bool pci_dev_disabled; /* FB base matches BAR of a disabled device */ + static int efifb_probe(struct platform_device *dev) { struct fb_info *info; -@@ -152,7 +155,7 @@ static int efifb_probe(struct platform_device *dev) +@@ -127,7 +130,7 @@ static int efifb_probe(struct platform_device *dev) unsigned int size_total; char *option = NULL; @@ -66,7 +67,7 @@ index 8c4dc1e1f94f..b827a8113e26 100644 return -ENODEV; if (fb_get_options("efifb", &option)) -@@ -360,3 +363,64 @@ static struct platform_driver efifb_driver = { +@@ -327,3 +330,64 @@ static struct platform_driver efifb_driver = { }; builtin_platform_driver(efifb_driver); |