Commit c1593ddd authored by Huacai Chen's avatar Huacai Chen Committed by Bjorn Helgaas
Browse files

PCI/VGA: Move vga_arb_integrated_gpu() earlier in file 

Move vga_arb_integrated_gpu() earlier in file to prepare for future patch.
No functional change intended.

[bhelgaas: pull #ifdefs inside function]
Link: https://lore.kernel.org/r/20211015061512.2941859-3-chenhuacai@loongson.cn
Link: https://lore.kernel.org/r/20220224224753.297579-3-helgaas@kernel.org


Signed-off-by: default avatarHuacai Chen <chenhuacai@loongson.cn>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent 1d38fe6e

drivers/pci/vgaarb.c

+11 −14
Original line number Diff line number Diff line
@@ -565,6 +565,17 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc) 
}

EXPORT_SYMBOL(vga_put);



static bool vga_arb_integrated_gpu(struct device *dev)

{

#if defined(CONFIG_ACPI)

	struct acpi_device *adev = ACPI_COMPANION(dev);



	return adev && !strcmp(acpi_device_hid(adev), ACPI_VIDEO_HID);

#else

	return false;

#endif

}



/*

 * Rules for using a bridge to control a VGA descendant decoding: if a bridge

 * has only one VGA descendant then it can be used to control the VGA routing
@@ -1430,20 +1441,6 @@ static struct miscdevice vga_arb_device = { 
	MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops

};



#if defined(CONFIG_ACPI)

static bool vga_arb_integrated_gpu(struct device *dev)

{

	struct acpi_device *adev = ACPI_COMPANION(dev);



	return adev && !strcmp(acpi_device_hid(adev), ACPI_VIDEO_HID);

}

#else

static bool vga_arb_integrated_gpu(struct device *dev)

{

	return false;

}

#endif



static void __init vga_arb_select_default_device(void)

{

	struct pci_dev *pdev, *found = NULL;