From: Huacai Chen <chenhuacai@loongson.cn>
To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Bjorn Helgaas <bhelgaas@google.com>
Cc: linux-pci@vger.kernel.org, dri-devel@lists.freedesktop.org,
Xuefeng Li <lixuefeng@loongson.cn>,
Huacai Chen <chenhuacai@gmail.com>,
Huacai Chen <chenhuacai@loongson.cn>
Subject: [PATCH V5 07/11] PCI/VGA: Remove vga_arb_select_default_device()
Date: Sat, 11 Sep 2021 17:30:52 +0800 [thread overview]
Message-ID: <20210911093056.1555274-8-chenhuacai@loongson.cn> (raw)
In-Reply-To: <20210911093056.1555274-1-chenhuacai@loongson.cn>
This patch is the last step of the rework: Since vga_arb_update_default_
device() is complete, we can remove vga_arb_select_default_device() and
its call-site.
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 89 --------------------------------------------
1 file changed, 89 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index c768365138b6..5a008d190ed8 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -1514,92 +1514,6 @@ static struct miscdevice vga_arb_device = {
MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops
};
-static void __init vga_arb_select_default_device(void)
-{
- struct pci_dev *pdev, *found = NULL;
- struct vga_device *vgadev;
-
-#if defined(CONFIG_X86) || defined(CONFIG_IA64)
- u64 base = screen_info.lfb_base;
- u64 size = screen_info.lfb_size;
- u64 limit;
- resource_size_t start, end;
- unsigned long flags;
- int i;
-
- if (screen_info.capabilities & VIDEO_CAPABILITY_64BIT_BASE)
- base |= (u64)screen_info.ext_lfb_base << 32;
-
- limit = base + size;
-
- 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;
-
- if (base < start || limit >= end)
- continue;
-
- 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");
- vga_set_default_device(vgadev->pdev);
- }
- }
-#endif
-
- if (!vga_default_device()) {
- list_for_each_entry_reverse(vgadev, &vga_list, list) {
- struct device *dev = &vgadev->pdev->dev;
- u16 cmd;
-
- pdev = vgadev->pdev;
- pci_read_config_word(pdev, PCI_COMMAND, &cmd);
- if (cmd & (PCI_COMMAND_IO | PCI_COMMAND_MEMORY)) {
- found = pdev;
- if (vga_arb_integrated_gpu(dev))
- break;
- }
- }
- }
-
- if (found) {
- vgaarb_info(&found->dev, "setting as boot device (VGA legacy resources not available)\n");
- vga_set_default_device(found);
- return;
- }
-
- if (!vga_default_device()) {
- vgadev = list_first_entry_or_null(&vga_list,
- struct vga_device, list);
- if (vgadev) {
- struct device *dev = &vgadev->pdev->dev;
- vgaarb_info(dev, "setting as boot device (VGA legacy resources not available)\n");
- vga_set_default_device(vgadev->pdev);
- }
- }
-}
-
static int __init vga_arb_device_init(void)
{
int rc;
@@ -1629,9 +1543,6 @@ static int __init vga_arb_device_init(void)
vgaarb_info(dev, "no bridge control possible\n");
}
- vga_arb_select_default_device();
-
- pr_info("loaded\n");
return rc;
}
subsys_initcall(vga_arb_device_init);
--
2.27.0
next prev parent reply other threads:[~2021-09-11 9:36 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-11 9:30 [PATCH V5 00/11] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-09-11 9:30 ` [PATCH V5 01/11] PCI/VGA: Move vgaarb to drivers/pci Huacai Chen
2021-09-11 9:30 ` [PATCH V5 02/11] PCI/VGA: Prefer vga_default_device() Huacai Chen
2021-09-11 9:30 ` [PATCH V5 03/11] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file Huacai Chen
2021-09-11 9:30 ` [PATCH V5 04/11] PCI/VGA: Split out vga_arb_update_default_device() Huacai Chen
2021-09-11 9:30 ` [PATCH V5 05/11] PCI/VGA: Update default VGA device if a better one found Huacai Chen
2021-09-11 9:30 ` [PATCH V5 06/11] PCI/VGA: Update default VGA device again for X86/IA64 Huacai Chen
2021-09-11 9:30 ` Huacai Chen [this message]
2021-09-11 9:30 ` [PATCH V5 08/11] PCI/VGA: Remove empty vga_arb_device_card_gone() Huacai Chen
2021-09-11 9:30 ` [PATCH V5 09/11] PCI/VGA: Log bridge control messages when adding devices Huacai Chen
2021-09-11 9:30 ` [PATCH V5 10/11] PCI/VGA: Use unsigned format string to print lock counts Huacai Chen
2021-09-11 9:30 ` [PATCH V5 11/11] PCI/VGA: Replace full MIT license text with SPDX identifier Huacai Chen
2021-09-14 19:18 ` [PATCH V5 00/11] PCI/VGA: Rework default VGA device selection Bjorn Helgaas
2021-09-16 8:28 ` Huacai Chen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210911093056.1555274-8-chenhuacai@loongson.cn \
--to=chenhuacai@loongson.cn \
--cc=airlied@linux.ie \
--cc=bhelgaas@google.com \
--cc=chenhuacai@gmail.com \
--cc=daniel@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-pci@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).