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 05/11] PCI/VGA: Update default VGA device if a better one found
Date: Sat, 11 Sep 2021 17:30:50 +0800 [thread overview]
Message-ID: <20210911093056.1555274-6-chenhuacai@loongson.cn> (raw)
In-Reply-To: <20210911093056.1555274-1-chenhuacai@loongson.cn>
This patch is the second step of the rework: Update default VGA device if
a better one is found. What is a better one? A device with legacy I/O
resources enabled is better those not enabled. And the integrated GPU is
better than others.
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
drivers/pci/vgaarb.c | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index f8f95244d499..02b68810273a 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -582,14 +582,32 @@ static bool vga_arb_integrated_gpu(struct device *dev)
static void vga_arb_update_default_device(struct vga_device *vgadev)
{
struct pci_dev *pdev = vgadev->pdev;
+ struct device *dev = &pdev->dev;
+ struct vga_device *vgadev_default;
/*
* If we don't have a default VGA device yet, and this device owns
* the legacy VGA resources, make it the default.
*/
- if (!vga_default_device() &&
- ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
- vgaarb_info(&pdev->dev, "setting as boot VGA device\n");
+ if (!vga_default_device()) {
+ if ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)
+ vgaarb_info(dev, "setting as boot VGA device\n");
+ else
+ vgaarb_info(dev, "setting as boot device (VGA legacy resources not available)\n");
+ vga_set_default_device(pdev);
+ }
+
+ vgadev_default = vgadev_find(vga_default);
+
+ /* Overridden by a better device */
+ if (vgadev_default && ((vgadev_default->owns & VGA_RSRC_LEGACY_MASK) == 0)
+ && ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)) {
+ vgaarb_info(dev, "overriding boot VGA device\n");
+ vga_set_default_device(pdev);
+ }
+
+ if (vga_arb_integrated_gpu(dev)) {
+ vgaarb_info(dev, "overriding boot VGA device\n");
vga_set_default_device(pdev);
}
}
--
2.27.0
next prev parent reply other threads:[~2021-09-11 9:35 UTC|newest]
Thread overview: 15+ 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 ` Huacai Chen [this message]
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 ` [PATCH V5 07/11] PCI/VGA: Remove vga_arb_select_default_device() Huacai Chen
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
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-6-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.