x86/uv/x2apic: update for change in pci bridge handling.
When I added 3448a19da4
I forgot about the special uv handling code for this, so this
patch fixes it up.
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Acked-by: Ingo Molnar
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
parent
83533c132a
commit
7ad35cf288
|
@ -632,14 +632,14 @@ late_initcall(uv_init_heartbeat);
|
||||||
|
|
||||||
/* Direct Legacy VGA I/O traffic to designated IOH */
|
/* Direct Legacy VGA I/O traffic to designated IOH */
|
||||||
int uv_set_vga_state(struct pci_dev *pdev, bool decode,
|
int uv_set_vga_state(struct pci_dev *pdev, bool decode,
|
||||||
unsigned int command_bits, bool change_bridge)
|
unsigned int command_bits, u32 flags)
|
||||||
{
|
{
|
||||||
int domain, bus, rc;
|
int domain, bus, rc;
|
||||||
|
|
||||||
PR_DEVEL("devfn %x decode %d cmd %x chg_brdg %d\n",
|
PR_DEVEL("devfn %x decode %d cmd %x flags %d\n",
|
||||||
pdev->devfn, decode, command_bits, change_bridge);
|
pdev->devfn, decode, command_bits, flags);
|
||||||
|
|
||||||
if (!change_bridge)
|
if (!(flags & PCI_VGA_STATE_CHANGE_BRIDGE))
|
||||||
return 0;
|
return 0;
|
||||||
|
|
||||||
if ((command_bits & PCI_COMMAND_IO) == 0)
|
if ((command_bits & PCI_COMMAND_IO) == 0)
|
||||||
|
|
|
@ -3271,11 +3271,11 @@ void __init pci_register_set_vga_state(arch_set_vga_state_t func)
|
||||||
}
|
}
|
||||||
|
|
||||||
static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
|
static int pci_set_vga_state_arch(struct pci_dev *dev, bool decode,
|
||||||
unsigned int command_bits, bool change_bridge)
|
unsigned int command_bits, u32 flags)
|
||||||
{
|
{
|
||||||
if (arch_set_vga_state)
|
if (arch_set_vga_state)
|
||||||
return arch_set_vga_state(dev, decode, command_bits,
|
return arch_set_vga_state(dev, decode, command_bits,
|
||||||
change_bridge);
|
flags);
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue