Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- From ff2cf2ed87119810fd3c6347cdd726a2371a60aa Mon Sep 17 00:00:00 2001
- From: x
- Date: x
- Subject: [PATCH] x
- ---
- vgaarb.c | 30 ++++--------------------------
- 1 file changed, 4 insertions(+), 26 deletions(-)
- diff --git a/vgaarb.c b/vgaarb.c
- index 5180c56..c770b5f 100644
- --- a/vgaarb.c
- +++ b/vgaarb.c
- @@ -1470,35 +1470,13 @@ static void __init vga_arb_select_default_device(void)
- list_for_each_entry(vgadev, &vga_list, list) {
- struct device *dev = &vgadev->pdev->dev;
- - /*
- - * Override vga_arbiter_add_pci_device()'s I/O based detection
- - * as it may take the wrong device (e.g. on Apple system under
- - * EFI).
- - *
- - * Select the device owning the boot framebuffer if there is
- - * one.
- - */
- -
- - /* Does firmware framebuffer belong to us? */
- - for (i = 0; i < DEVICE_COUNT_RESOURCE; i++) {
- - flags = pci_resource_flags(vgadev->pdev, i);
- -
- - if ((flags & IORESOURCE_MEM) == 0)
- - continue;
- -
- - start = pci_resource_start(vgadev->pdev, i);
- - end = pci_resource_end(vgadev->pdev, i);
- - if (!start || !end)
- - continue;
- +#define NVIDIA_PCI_ADDR "0000:00:02.0"
- - if (base < start || limit >= end)
- - continue;
- + vgaarb_info(dev, "checking %s\n", pci_name(pdev));
- - if (!vga_default_device())
- - vgaarb_info(dev, "setting as boot device\n");
- - else if (vgadev->pdev != vga_default_device())
- - vgaarb_info(dev, "overriding boot device\n");
- + if (strcmp(pci_name(vgadev->pdev), NVIDIA_PCI_ADDR) == 0) {
- + vgaarb_info(dev, "setting as boot device\n");
- vga_set_default_device(vgadev->pdev);
- }
- }
- --
- 2.25.1
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement