Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cf20bee authored by Dave Airlie's avatar Dave Airlie
Browse files

x86/vga: set the default device from the fixup. 



Since Matthew's efi/vga changes on non-EFI machines we were failing
to tell the vgaarb/switcheroo what the default device was, this
sets the default device in the quirk if none has been set before.

This fixes the switcheroo on my T410s.

Cc: Matthew Garrett <mjg@redhat.com>
Acked-by: default avatarH. Peter Anvin <hpa@zytor.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent f3b7e17c

arch/x86/pci/fixup.c

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/pci.h>

#include <linux/init.h>

#include <asm/pci_x86.h>

#include <asm/vga.h>



static void __devinit pci_fixup_i450nx(struct pci_dev *d)

{
@@ -348,6 +349,8 @@ static void __devinit pci_fixup_video(struct pci_dev *pdev) 
	if (config & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {

		pdev->resource[PCI_ROM_RESOURCE].flags |= IORESOURCE_ROM_SHADOW;

		dev_printk(KERN_DEBUG, &pdev->dev, "Boot video device\n");

		if (!vga_default_device())

			vga_set_default_device(pdev);

	}

}

DECLARE_PCI_FIXUP_CLASS_FINAL(PCI_ANY_ID, PCI_ANY_ID,