1 files changed, 21 insertions, 0 deletions

diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c
index b5e60268d93f..c61ea57d1ba1 100644
--- a/arch/x86/pci/fixup.c
+++ b/arch/x86/pci/fixup.c
@@ -326,6 +326,27 @@ static void pci_fixup_video(struct pci_dev *pdev)
         struct pci_bus *bus;
         u16 config;
 
+        if (!vga_default_device()) {
+                resource_size_t start, end;
+                int i;
+
+                /* Does firmware framebuffer belong to us? */
+                for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
+                        if (!(pci_resource_flags(pdev, i) & IORESOURCE_MEM))
+                                continue;
+
+                        start = pci_resource_start(pdev, i);
+                        end  = pci_resource_end(pdev, i);
+
+                        if (!start || !end)
+                                continue;
+
+                        if (screen_info.lfb_base >= start &&
+                            (screen_info.lfb_base + screen_info.lfb_size) < end)
+                                vga_set_default_device(pdev);
+                }
+        }
+
         /* Is VGA routed to us? */
         bus = pdev->bus;
         while (bus) {