diff options
| author | Matthew Garrett <mjg@redhat.com> | 2012-04-16 16:26:03 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2012-04-24 09:50:16 +0100 |
| commit | 2fbe8c7c3ebfed2059a6597322bb0dbc4d96feb5 (patch) | |
| tree | 262a6f5783ec3a91a5c7d51a63383a99965f2697 /drivers | |
| parent | 1a39b310e920bb7098067d96411b31e459ae8f32 (diff) | |
| download | linux-stable-2fbe8c7c3ebfed2059a6597322bb0dbc4d96feb5.tar.gz linux-stable-2fbe8c7c3ebfed2059a6597322bb0dbc4d96feb5.tar.bz2 linux-stable-2fbe8c7c3ebfed2059a6597322bb0dbc4d96feb5.zip | |
vga-switcheroo: Use vga_default_device()
vga-switcheroo currently changes the default VGA device by fiddling with
the IORESOURCE_ROM_SHADOW flag on the device. This isn't strictly accurate,
since there's no guarantee that switching also changes the ROM decoding.
Switch over to using the vgaarb functions for this.
Signed-off-by: Matthew Garrett <mjg@redhat.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/vga/vga_switcheroo.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/gpu/vga/vga_switcheroo.c b/drivers/gpu/vga/vga_switcheroo.c index 58434e804d91..9d830286f883 100644 --- a/drivers/gpu/vga/vga_switcheroo.c +++ b/drivers/gpu/vga/vga_switcheroo.c @@ -28,6 +28,8 @@ #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; @@ -122,7 +124,7 @@ int vga_switcheroo_register_client(struct pci_dev *pdev, 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) + if (pdev == vga_default_device()) vgasr_priv.clients[index].active = true; vgasr_priv.registered_clients |= (1 << index); @@ -230,9 +232,8 @@ static int vga_switchto_stage1(struct vga_switcheroo_client *new_client) if (new_client->pwr_state == VGA_SWITCHEROO_OFF) vga_switchon(new_client); - /* 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; + vga_set_default_device(new_client->pdev); + return 0; } |