Patched in Tegra support.

3 files changed, 185 insertions, 264 deletions

diff --git a/drivers/gpu/vga/Kconfig b/drivers/gpu/vga/Kconfig
index 29437eabe09..96c83a9a76b 100644
--- a/drivers/gpu/vga/Kconfig
+++ b/drivers/gpu/vga/Kconfig
@@ -1,7 +1,7 @@
 config VGA_ARB
         bool "VGA Arbitration" if EXPERT
         default y
-        depends on (PCI && !S390)
+        depends on PCI
         help
           Some "legacy" VGA devices implemented on PCI typically have the same
           hard-decoded addresses as they did on ISA. When multiple PCI devices
@@ -21,7 +21,6 @@ config VGA_SWITCHEROO
         bool "Laptop Hybrid Graphics - GPU switching support"
         depends on X86
         depends on ACPI
-        select VGA_ARB
         help
           Many laptops released in 2008/9/10 have two GPUs with a multiplexer
           to switch between them. This adds support for dynamic switching when
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c
index fa60add0ff6..58434e804d9 100644
--- a/drivers/gpu/vga/vga_switcheroo.c
+++ b/drivers/gpu/vga/vga_switcheroo.c
@@ -18,6 +18,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/dmi.h>
 #include <linux/seq_file.h>
 #include <linux/uaccess.h>
 #include <linux/fs.h>
@@ -27,16 +28,15 @@
 #include <linux/pci.h>
 #include <linux/vga_switcheroo.h>
 
-#include <linux/vgaarb.h>
-
 struct vga_switcheroo_client {
         struct pci_dev *pdev;
         struct fb_info *fb_info;
         int pwr_state;
-        const struct vga_switcheroo_client_ops *ops;
+        void (*set_gpu_state)(struct pci_dev *pdev, enum vga_switcheroo_state);
+        void (*reprobe)(struct pci_dev *pdev);
+        bool (*can_switch)(struct pci_dev *pdev);
         int id;
         bool active;
-        struct list_head list;
 };
 
 static DEFINE_MUTEX(vgasr_mutex);
@@ -51,52 +51,16 @@ struct vgasr_priv {
         struct dentry *switch_file;
 
         int registered_clients;
-        struct list_head clients;
+        struct vga_switcheroo_client clients[VGA_SWITCHEROO_MAX_CLIENTS];
 
         struct vga_switcheroo_handler *handler;
 };
 
-#define ID_BIT_AUDIO            0x100
-#define client_is_audio(c)      ((c)->id & ID_BIT_AUDIO)
-#define client_is_vga(c)        ((c)->id == -1 || !client_is_audio(c))
-#define client_id(c)            ((c)->id & ~ID_BIT_AUDIO)
-
 static int vga_switcheroo_debugfs_init(struct vgasr_priv *priv);
 static void vga_switcheroo_debugfs_fini(struct vgasr_priv *priv);
 
 /* only one switcheroo per system */
-static struct vgasr_priv vgasr_priv = {
-        .clients = LIST_HEAD_INIT(vgasr_priv.clients),
-};
-
-static bool vga_switcheroo_ready(void)
-{
-        /* we're ready if we get two clients + handler */
-        return !vgasr_priv.active &&
-               vgasr_priv.registered_clients == 2 && vgasr_priv.handler;
-}
-
-static void vga_switcheroo_enable(void)
-{
-        int ret;
-        struct vga_switcheroo_client *client;
-
-        /* call the handler to init */
-        if (vgasr_priv.handler->init)
-                vgasr_priv.handler->init();
-
-        list_for_each_entry(client, &vgasr_priv.clients, list) {
-                if (client->id != -1)
-                        continue;
-                ret = vgasr_priv.handler->get_client_id(client->pdev);
-                if (ret < 0)
-                        return;
-
-                client->id = ret;
-        }
-        vga_switcheroo_debugfs_init(&vgasr_priv);
-        vgasr_priv.active = true;
-}
+static struct vgasr_priv vgasr_priv;
 
 int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler)
 {
@@ -107,10 +71,6 @@ int vga_switcheroo_register_handler(struct vga_switcheroo_handler *handler)
         }
 
         vgasr_priv.handler = handler;
-        if (vga_switcheroo_ready()) {
-                printk(KERN_INFO "vga_switcheroo: enabled\n");
-                vga_switcheroo_enable();
-        }
         mutex_unlock(&vgasr_mutex);
         return 0;
 }
@@ -120,120 +80,78 @@ void vga_switcheroo_unregister_handler(void)
 {
         mutex_lock(&vgasr_mutex);
         vgasr_priv.handler = NULL;
-        if (vgasr_priv.active) {
-                pr_info("vga_switcheroo: disabled\n");
-                vga_switcheroo_debugfs_fini(&vgasr_priv);
-                vgasr_priv.active = false;
-        }
         mutex_unlock(&vgasr_mutex);
 }
 EXPORT_SYMBOL(vga_switcheroo_unregister_handler);
 
-static int register_client(struct pci_dev *pdev,
-                           const struct vga_switcheroo_client_ops *ops,
-                           int id, bool active)
+static void vga_switcheroo_enable(void)
 {
-        struct vga_switcheroo_client *client;
+        int i;
+        int ret;
+        /* call the handler to init */
+        vgasr_priv.handler->init();
 
-        client = kzalloc(sizeof(*client), GFP_KERNEL);
-        if (!client)
-                return -ENOMEM;
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                ret = vgasr_priv.handler->get_client_id(vgasr_priv.clients[i].pdev);
+                if (ret < 0)
+                        return;
 
-        client->pwr_state = VGA_SWITCHEROO_ON;
-        client->pdev = pdev;
-        client->ops = ops;
-        client->id = id;
-        client->active = active;
+                vgasr_priv.clients[i].id = ret;
+        }
+        vga_switcheroo_debugfs_init(&vgasr_priv);
+        vgasr_priv.active = true;
+}
 
-        mutex_lock(&vgasr_mutex);
-        list_add_tail(&client->list, &vgasr_priv.clients);
-        if (client_is_vga(client))
-                vgasr_priv.registered_clients++;
+int vga_switcheroo_register_client(struct pci_dev *pdev,
+                                   void (*set_gpu_state)(struct pci_dev *pdev, enum vga_switcheroo_state),
+                                   void (*reprobe)(struct pci_dev *pdev),
+                                   bool (*can_switch)(struct pci_dev *pdev))
+{
+        int index;
 
-        if (vga_switcheroo_ready()) {
+        mutex_lock(&vgasr_mutex);
+        /* don't do IGD vs DIS here */
+        if (vgasr_priv.registered_clients & 1)
+                index = 1;
+        else
+                index = 0;
+
+        vgasr_priv.clients[index].pwr_state = VGA_SWITCHEROO_ON;
+        vgasr_priv.clients[index].pdev = pdev;
+        vgasr_priv.clients[index].set_gpu_state = set_gpu_state;
+        vgasr_priv.clients[index].reprobe = reprobe;
+        vgasr_priv.clients[index].can_switch = can_switch;
+        vgasr_priv.clients[index].id = -1;
+        if (pdev->resource[PCI_ROM_RESOURCE].flags & IORESOURCE_ROM_SHADOW)
+                vgasr_priv.clients[index].active = true;
+
+        vgasr_priv.registered_clients |= (1 << index);
+
+        /* if we get two clients + handler */
+        if (vgasr_priv.registered_clients == 0x3 && vgasr_priv.handler) {
                 printk(KERN_INFO "vga_switcheroo: enabled\n");
                 vga_switcheroo_enable();
         }
         mutex_unlock(&vgasr_mutex);
         return 0;
 }
-
-int vga_switcheroo_register_client(struct pci_dev *pdev,
-                                   const struct vga_switcheroo_client_ops *ops)
-{
-        return register_client(pdev, ops, -1,
-                               pdev == vga_default_device());
-}
 EXPORT_SYMBOL(vga_switcheroo_register_client);
 
-int vga_switcheroo_register_audio_client(struct pci_dev *pdev,
-                                         const struct vga_switcheroo_client_ops *ops,
-                                         int id, bool active)
-{
-        return register_client(pdev, ops, id | ID_BIT_AUDIO, active);
-}
-EXPORT_SYMBOL(vga_switcheroo_register_audio_client);
-
-static struct vga_switcheroo_client *
-find_client_from_pci(struct list_head *head, struct pci_dev *pdev)
-{
-        struct vga_switcheroo_client *client;
-        list_for_each_entry(client, head, list)
-                if (client->pdev == pdev)
-                        return client;
-        return NULL;
-}
-
-static struct vga_switcheroo_client *
-find_client_from_id(struct list_head *head, int client_id)
-{
-        struct vga_switcheroo_client *client;
-        list_for_each_entry(client, head, list)
-                if (client->id == client_id)
-                        return client;
-        return NULL;
-}
-
-static struct vga_switcheroo_client *
-find_active_client(struct list_head *head)
-{
-        struct vga_switcheroo_client *client;
-        list_for_each_entry(client, head, list)
-                if (client->active && client_is_vga(client))
-                        return client;
-        return NULL;
-}
-
-int vga_switcheroo_get_client_state(struct pci_dev *pdev)
-{
-        struct vga_switcheroo_client *client;
-
-        client = find_client_from_pci(&vgasr_priv.clients, pdev);
-        if (!client)
-                return VGA_SWITCHEROO_NOT_FOUND;
-        if (!vgasr_priv.active)
-                return VGA_SWITCHEROO_INIT;
-        return client->pwr_state;
-}
-EXPORT_SYMBOL(vga_switcheroo_get_client_state);
-
 void vga_switcheroo_unregister_client(struct pci_dev *pdev)
 {
-        struct vga_switcheroo_client *client;
+        int i;
 
         mutex_lock(&vgasr_mutex);
-        client = find_client_from_pci(&vgasr_priv.clients, pdev);
-        if (client) {
-                if (client_is_vga(client))
-                        vgasr_priv.registered_clients--;
-                list_del(&client->list);
-                kfree(client);
-        }
-        if (vgasr_priv.active && vgasr_priv.registered_clients < 2) {
-                printk(KERN_INFO "vga_switcheroo: disabled\n");
-                vga_switcheroo_debugfs_fini(&vgasr_priv);
-                vgasr_priv.active = false;
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                if (vgasr_priv.clients[i].pdev == pdev) {
+                        vgasr_priv.registered_clients &= ~(1 << i);
+                        break;
+                }
         }
+
+        printk(KERN_INFO "vga_switcheroo: disabled\n");
+        vga_switcheroo_debugfs_fini(&vgasr_priv);
+        vgasr_priv.active = false;
         mutex_unlock(&vgasr_mutex);
 }
 EXPORT_SYMBOL(vga_switcheroo_unregister_client);
@@ -241,29 +159,29 @@ EXPORT_SYMBOL(vga_switcheroo_unregister_client);
 void vga_switcheroo_client_fb_set(struct pci_dev *pdev,
                                  struct fb_info *info)
 {
-        struct vga_switcheroo_client *client;
+        int i;
 
         mutex_lock(&vgasr_mutex);
-        client = find_client_from_pci(&vgasr_priv.clients, pdev);
-        if (client)
-                client->fb_info = info;
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                if (vgasr_priv.clients[i].pdev == pdev) {
+                        vgasr_priv.clients[i].fb_info = info;
+                        break;
+                }
+        }
         mutex_unlock(&vgasr_mutex);
 }
 EXPORT_SYMBOL(vga_switcheroo_client_fb_set);
 
 static int vga_switcheroo_show(struct seq_file *m, void *v)
 {
-        struct vga_switcheroo_client *client;
-        int i = 0;
+        int i;
         mutex_lock(&vgasr_mutex);
-        list_for_each_entry(client, &vgasr_priv.clients, list) {
-                seq_printf(m, "%d:%s%s:%c:%s:%s\n", i,
-                           client_id(client) == VGA_SWITCHEROO_DIS ? "DIS" : "IGD",
-                           client_is_vga(client) ? "" : "-Audio",
-                           client->active ? '+' : ' ',
-                           client->pwr_state ? "Pwr" : "Off",
-                           pci_name(client->pdev));
-                i++;
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                seq_printf(m, "%d:%s:%c:%s:%s\n", i,
+                           vgasr_priv.clients[i].id == VGA_SWITCHEROO_DIS ? "DIS" : "IGD",
+                           vgasr_priv.clients[i].active ? '+' : ' ',
+                           vgasr_priv.clients[i].pwr_state ? "Pwr" : "Off",
+                           pci_name(vgasr_priv.clients[i].pdev));
         }
         mutex_unlock(&vgasr_mutex);
         return 0;
@@ -279,7 +197,7 @@ static int vga_switchon(struct vga_switcheroo_client *client)
         if (vgasr_priv.handler->power_state)
                 vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_ON);
         /* call the driver callback to turn on device */
-        client->ops->set_gpu_state(client->pdev, VGA_SWITCHEROO_ON);
+        client->set_gpu_state(client->pdev, VGA_SWITCHEROO_ON);
         client->pwr_state = VGA_SWITCHEROO_ON;
         return 0;
 }
@@ -287,37 +205,34 @@ static int vga_switchon(struct vga_switcheroo_client *client)
 static int vga_switchoff(struct vga_switcheroo_client *client)
 {
         /* call the driver callback to turn off device */
-        client->ops->set_gpu_state(client->pdev, VGA_SWITCHEROO_OFF);
+        client->set_gpu_state(client->pdev, VGA_SWITCHEROO_OFF);
         if (vgasr_priv.handler->power_state)
                 vgasr_priv.handler->power_state(client->id, VGA_SWITCHEROO_OFF);
         client->pwr_state = VGA_SWITCHEROO_OFF;
         return 0;
 }
 
-static void set_audio_state(int id, int state)
-{
-        struct vga_switcheroo_client *client;
-
-        client = find_client_from_id(&vgasr_priv.clients, id | ID_BIT_AUDIO);
-        if (client && client->pwr_state != state) {
-                client->ops->set_gpu_state(client->pdev, state);
-                client->pwr_state = state;
-        }
-}
-
 /* stage one happens before delay */
 static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
 {
-        struct vga_switcheroo_client *active;
+        int i;
+        struct vga_switcheroo_client *active = NULL;
 
-        active = find_active_client(&vgasr_priv.clients);
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                if (vgasr_priv.clients[i].active == true) {
+                        active = &vgasr_priv.clients[i];
+                        break;
+                }
+        }
         if (!active)
                 return 0;
 
         if (new_client->pwr_state == VGA_SWITCHEROO_OFF)
                 vga_switchon(new_client);
 
-        vga_set_default_device(new_client->pdev);
+        /* swap shadow resource to denote boot VGA device has changed so X starts on new device */
+        active->pdev->resource[PCI_ROM_RESOURCE].flags &= ~IORESOURCE_ROM_SHADOW;
+        new_client->pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_SHADOW;
         return 0;
 }
 
@@ -325,16 +240,20 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client)
 static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
 {
         int ret;
-        struct vga_switcheroo_client *active;
+        int i;
+        struct vga_switcheroo_client *active = NULL;
 
-        active = find_active_client(&vgasr_priv.clients);
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                if (vgasr_priv.clients[i].active == true) {
+                        active = &vgasr_priv.clients[i];
+                        break;
+                }
+        }
         if (!active)
                 return 0;
 
         active->active = false;
 
-        set_audio_state(active->id, VGA_SWITCHEROO_OFF);
-
         if (new_client->fb_info) {
                 struct fb_event event;
                 event.info = new_client->fb_info;
@@ -345,37 +264,23 @@ static int vga_switchto_stage2(struct vga_switcheroo_client *new_client)
         if (ret)
                 return ret;
 
-        if (new_client->ops->reprobe)
-                new_client->ops->reprobe(new_client->pdev);
+        if (new_client->reprobe)
+                new_client->reprobe(new_client->pdev);
 
         if (active->pwr_state == VGA_SWITCHEROO_ON)
                 vga_switchoff(active);
 
-        set_audio_state(new_client->id, VGA_SWITCHEROO_ON);
-
         new_client->active = true;
         return 0;
 }
 
-static bool check_can_switch(void)
-{
-        struct vga_switcheroo_client *client;
-
-        list_for_each_entry(client, &vgasr_priv.clients, list) {
-                if (!client->ops->can_switch(client->pdev)) {
-                        printk(KERN_ERR "vga_switcheroo: client %x refused switch\n", client->id);
-                        return false;
-                }
-        }
-        return true;
-}
-
 static ssize_t
 vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
                              size_t cnt, loff_t *ppos)
 {
         char usercmd[64];
-        int ret;
+        const char *pdev_name;
+        int i, ret;
         bool delay = false, can_switch;
         bool just_mux = false;
         int client_id = -1;
@@ -396,23 +301,21 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 
         /* pwr off the device not in use */
         if (strncmp(usercmd, "OFF", 3) == 0) {
-                list_for_each_entry(client, &vgasr_priv.clients, list) {
-                        if (client->active || client_is_audio(client))
+                for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                        if (vgasr_priv.clients[i].active)
                                 continue;
-                        set_audio_state(client->id, VGA_SWITCHEROO_OFF);
-                        if (client->pwr_state == VGA_SWITCHEROO_ON)
-                                vga_switchoff(client);
+                        if (vgasr_priv.clients[i].pwr_state == VGA_SWITCHEROO_ON)
+                                vga_switchoff(&vgasr_priv.clients[i]);
                 }
                 goto out;
         }
         /* pwr on the device not in use */
         if (strncmp(usercmd, "ON", 2) == 0) {
-                list_for_each_entry(client, &vgasr_priv.clients, list) {
-                        if (client->active || client_is_audio(client))
+                for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                        if (vgasr_priv.clients[i].active)
                                 continue;
-                        if (client->pwr_state == VGA_SWITCHEROO_OFF)
-                                vga_switchon(client);
-                        set_audio_state(client->id, VGA_SWITCHEROO_ON);
+                        if (vgasr_priv.clients[i].pwr_state == VGA_SWITCHEROO_OFF)
+                                vga_switchon(&vgasr_priv.clients[i]);
                 }
                 goto out;
         }
@@ -445,9 +348,13 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
 
         if (client_id == -1)
                 goto out;
-        client = find_client_from_id(&vgasr_priv.clients, client_id);
-        if (!client)
-                goto out;
+
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                if (vgasr_priv.clients[i].id == client_id) {
+                        client = &vgasr_priv.clients[i];
+                        break;
+                }
+        }
 
         vgasr_priv.delayed_switch_active = false;
 
@@ -456,16 +363,24 @@ vga_switcheroo_debugfs_write(struct file *filp, const char __user *ubuf,
                 goto out;
         }
 
-        if (client->active)
+        if (client->active == true)
                 goto out;
 
         /* okay we want a switch - test if devices are willing to switch */
-        can_switch = check_can_switch();
+        can_switch = true;
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                can_switch = vgasr_priv.clients[i].can_switch(vgasr_priv.clients[i].pdev);
+                if (can_switch == false) {
+                        printk(KERN_ERR "vga_switcheroo: client %d refused switch\n", i);
+                        break;
+                }
+        }
 
         if (can_switch == false && delay == false)
                 goto out;
 
-        if (can_switch) {
+        if (can_switch == true) {
+                pdev_name = pci_name(client->pdev);
                 ret = vga_switchto_stage1(client);
                 if (ret)
                         printk(KERN_ERR "vga_switcheroo: switching failed stage 1 %d\n", ret);
@@ -536,7 +451,10 @@ fail:
 
 int vga_switcheroo_process_delayed_switch(void)
 {
-        struct vga_switcheroo_client *client;
+        struct vga_switcheroo_client *client = NULL;
+        const char *pdev_name;
+        bool can_switch = true;
+        int i;
         int ret;
         int err = -EINVAL;
 
@@ -546,11 +464,20 @@ int vga_switcheroo_process_delayed_switch(void)
 
         printk(KERN_INFO "vga_switcheroo: processing delayed switch to %d\n", vgasr_priv.delayed_client_id);
 
-        client = find_client_from_id(&vgasr_priv.clients,
-                                     vgasr_priv.delayed_client_id);
-        if (!client || !check_can_switch())
+        for (i = 0; i < VGA_SWITCHEROO_MAX_CLIENTS; i++) {
+                if (vgasr_priv.clients[i].id == vgasr_priv.delayed_client_id)
+                        client = &vgasr_priv.clients[i];
+                can_switch = vgasr_priv.clients[i].can_switch(vgasr_priv.clients[i].pdev);
+                if (can_switch == false) {
+                        printk(KERN_ERR "vga_switcheroo: client %d refused switch\n", i);
+                        break;
+                }
+        }
+
+        if (can_switch == false || client == NULL)
                 goto err;
 
+        pdev_name = pci_name(client->pdev);
         ret = vga_switchto_stage2(client);
         if (ret)
                 printk(KERN_ERR "vga_switcheroo: delayed switching failed stage 2 %d\n", ret);
@@ -562,3 +489,4 @@ err:
         return err;
 }
 EXPORT_SYMBOL(vga_switcheroo_process_delayed_switch);
+
diff --git a/drivers/gpu/vga/vgaarb.c b/drivers/gpu/vga/vgaarb.c
index e893f6e1937..c72f1c0b5e6 100644
--- a/drivers/gpu/vga/vgaarb.c
+++ b/drivers/gpu/vga/vgaarb.c
@@ -136,17 +136,6 @@ struct pci_dev *vga_default_device(void)
 {
         return vga_default;
 }
-
-EXPORT_SYMBOL_GPL(vga_default_device);
-
-void vga_set_default_device(struct pci_dev *pdev)
-{
-        if (vga_default == pdev)
-                return;
-
-        pci_dev_put(vga_default);
-        vga_default = pci_dev_get(pdev);
-}
 #endif
 
 static inline void vga_irq_set_state(struct vga_device *vgadev, bool state)
@@ -476,29 +465,31 @@ static void vga_arbiter_check_bridge_sharing(struct vga_device *vgadev)
         while (new_bus) {
                 new_bridge = new_bus->self;
 
-                /* go through list of devices already registered */
-                list_for_each_entry(same_bridge_vgadev, &vga_list, list) {
-                        bus = same_bridge_vgadev->pdev->bus;
-                        bridge = bus->self;
-
-                        /* see if the share a bridge with this device */
-                        if (new_bridge == bridge) {
-                                /* if their direct parent bridge is the same
-                                   as any bridge of this device then it can't be used
-                                   for that device */
-                                same_bridge_vgadev->bridge_has_one_vga = false;
-                        }
-
-                        /* now iterate the previous devices bridge hierarchy */
-                        /* if the new devices parent bridge is in the other devices
-                           hierarchy then we can't use it to control this device */
-                        while (bus) {
+                if (new_bridge) {
+                        /* go through list of devices already registered */
+                        list_for_each_entry(same_bridge_vgadev, &vga_list, list) {
+                                bus = same_bridge_vgadev->pdev->bus;
                                 bridge = bus->self;
-                                if (bridge) {
-                                        if (bridge == vgadev->pdev->bus->self)
-                                                vgadev->bridge_has_one_vga = false;
+
+                                /* see if the share a bridge with this device */
+                                if (new_bridge == bridge) {
+                                        /* if their direct parent bridge is the same
+                                           as any bridge of this device then it can't be used
+                                           for that device */
+                                        same_bridge_vgadev->bridge_has_one_vga = false;
+                                }
+
+                                /* now iterate the previous devices bridge hierarchy */
+                                /* if the new devices parent bridge is in the other devices
+                                   hierarchy then we can't use it to control this device */
+                                while (bus) {
+                                        bridge = bus->self;
+                                        if (bridge) {
+                                                if (bridge == vgadev->pdev->bus->self)
+                                                        vgadev->bridge_has_one_vga = false;
+                                        }
+                                        bus = bus->parent;
                                 }
-                                bus = bus->parent;
                         }
                 }
                 new_bus = new_bus->parent;
@@ -581,7 +572,7 @@ static bool vga_arbiter_add_pci_device(struct pci_dev *pdev)
 #ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
         if (vga_default == NULL &&
             ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK))
-                vga_set_default_device(pdev);
+                vga_default = pci_dev_get(pdev);
 #endif
 
         vga_arbiter_check_bridge_sharing(vgadev);
@@ -616,10 +607,10 @@ static bool vga_arbiter_del_pci_device(struct pci_dev *pdev)
                 goto bail;
         }
 
-#ifndef __ARCH_HAS_VGA_DEFAULT_DEVICE
-        if (vga_default == pdev)
-                vga_set_default_device(NULL);
-#endif
+        if (vga_default == pdev) {
+                pci_dev_put(vga_default);
+                vga_default = NULL;
+        }
 
         if (vgadev->decodes & (VGA_RSRC_LEGACY_IO | VGA_RSRC_LEGACY_MEM))
                 vga_decode_count--;
@@ -1002,20 +993,14 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                                 uc = &priv->cards[i];
                 }
 
-                if (!uc) {
-                        ret_val = -EINVAL;
-                        goto done;
-                }
+                if (!uc)
+                        return -EINVAL;
 
-                if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0) {
-                        ret_val = -EINVAL;
-                        goto done;
-                }
+                if (io_state & VGA_RSRC_LEGACY_IO && uc->io_cnt == 0)
+                        return -EINVAL;
 
-                if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0) {
-                        ret_val = -EINVAL;
-                        goto done;
-                }
+                if (io_state & VGA_RSRC_LEGACY_MEM && uc->mem_cnt == 0)
+                        return -EINVAL;
 
                 vga_put(pdev, io_state);
 
@@ -1068,6 +1053,7 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                 }
 
         } else if (strncmp(curr_pos, "target ", 7) == 0) {
+                struct pci_bus *pbus;
                 unsigned int domain, bus, devfn;
                 struct vga_device *vgadev;
 
@@ -1086,11 +1072,19 @@ static ssize_t vga_arb_write(struct file *file, const char __user * buf,
                         pr_debug("vgaarb: %s ==> %x:%x:%x.%x\n", curr_pos,
                                 domain, bus, PCI_SLOT(devfn), PCI_FUNC(devfn));
 
-                        pdev = pci_get_domain_bus_and_slot(domain, bus, devfn);
+                        pbus = pci_find_bus(domain, bus);
+                        pr_debug("vgaarb: pbus %p\n", pbus);
+                        if (pbus == NULL) {
+                                pr_err("vgaarb: invalid PCI domain and/or bus address %x:%x\n",
+                                        domain, bus);
+                                ret_val = -ENODEV;
+                                goto done;
+                        }
+                        pdev = pci_get_slot(pbus, devfn);
                         pr_debug("vgaarb: pdev %p\n", pdev);
                         if (!pdev) {
-                                pr_err("vgaarb: invalid PCI address %x:%x:%x\n",
-                                        domain, bus, devfn);
+                                pr_err("vgaarb: invalid PCI address %x:%x\n",
+                                        bus, devfn);
                                 ret_val = -ENODEV;
                                 goto done;
                         }