Merge tag 'drm-misc-fixes-2017-11-02' of git://anongit.freedesktop.org/drm/drm-misc...

[sfrench/cifs-2.6.git] / drivers / gpu / vga / vgaarb.c

diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index 76875f6299b85579fcbc43fd0a033e916572748b..d35d6d271f3f16d85918e137f969520fa052acd3 100644 (file)
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -1402,29 +1402,14 @@ static struct miscdevice vga_arb_device = {
        MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops
 };
 
-static int __init vga_arb_device_init(void)
+static void __init vga_arb_select_default_device(void)
 {
-       int rc;
        struct pci_dev *pdev;
        struct vga_device *vgadev;
 
-       rc = misc_register(&vga_arb_device);
-       if (rc < 0)
-               pr_err("error %d registering device\n", rc);
-
-       bus_register_notifier(&pci_bus_type, &pci_notifier);
-
-       /* We add all pci devices satisfying vga class in the arbiter by
-        * default */
-       pdev = NULL;
-       while ((pdev =
-               pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
-                              PCI_ANY_ID, pdev)) != NULL)
-               vga_arbiter_add_pci_device(pdev);
-
+#if defined(CONFIG_X86) || defined(CONFIG_IA64)
        list_for_each_entry(vgadev, &vga_list, list) {
                struct device *dev = &vgadev->pdev->dev;
-#if defined(CONFIG_X86) || defined(CONFIG_IA64)
                /*
                 * Override vga_arbiter_add_pci_device()'s I/O based detection
                 * as it may take the wrong device (e.g. on Apple system under
@@ -1461,13 +1446,66 @@ static int __init vga_arb_device_init(void)
                                vgaarb_info(dev, "overriding boot device\n");
                        vga_set_default_device(vgadev->pdev);
                }
+       }
 #endif
+
+       if (!vga_default_device()) {
+               list_for_each_entry(vgadev, &vga_list, list) {
+                       struct device *dev = &vgadev->pdev->dev;
+                       u16 cmd;
+
+                       pdev = vgadev->pdev;
+                       pci_read_config_word(pdev, PCI_COMMAND, &cmd);
+                       if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {
+                               vgaarb_info(dev, "setting as boot device (VGA legacy resources not available)\n");
+                               vga_set_default_device(pdev);
+                               break;
+                       }
+               }
+       }
+
+       if (!vga_default_device()) {
+               vgadev = list_first_entry_or_null(&vga_list,
+                                                 struct vga_device, list);
+               if (vgadev) {
+                       struct device *dev = &vgadev->pdev->dev;
+                       vgaarb_info(dev, "setting as boot device (VGA legacy resources not available)\n");
+                       vga_set_default_device(vgadev->pdev);
+               }
+       }
+}
+
+static int __init vga_arb_device_init(void)
+{
+       int rc;
+       struct pci_dev *pdev;
+       struct vga_device *vgadev;
+
+       rc = misc_register(&vga_arb_device);
+       if (rc < 0)
+               pr_err("error %d registering device\n", rc);
+
+       bus_register_notifier(&pci_bus_type, &pci_notifier);
+
+       /* We add all PCI devices satisfying VGA class in the arbiter by
+        * default */
+       pdev = NULL;
+       while ((pdev =
+               pci_get_subsys(PCI_ANY_ID, PCI_ANY_ID, PCI_ANY_ID,
+                              PCI_ANY_ID, pdev)) != NULL)
+               vga_arbiter_add_pci_device(pdev);
+
+       list_for_each_entry(vgadev, &vga_list, list) {
+               struct device *dev = &vgadev->pdev->dev;
+
                if (vgadev->bridge_has_one_vga)
                        vgaarb_info(dev, "bridge control possible\n");
                else
                        vgaarb_info(dev, "no bridge control possible\n");
        }
 
+       vga_arb_select_default_device();
+
        pr_info("loaded\n");
        return rc;
 }