From: Bjorn Helgaas <helgaas@kernel.org>
To: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
Maxime Ripard <mripard@kernel.org>,
Thomas Zimmermann <tzimmermann@suse.de>
Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>,
Xuefeng Li <lixuefeng@loongson.cn>,
Huacai Chen <chenhuacai@loongson.cn>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
dri-devel@lists.freedesktop.org,
Huacai Chen <chenhuacai@kernel.org>,
Daniel Axtens <dja@axtens.net>,
Zhou Wang <wangzhou1@hisilicon.com>
Subject: [PATCH v9 07/11] PCI/VGA: Move disabled VGA device detection to ADD_DEVICE path
Date: Thu, 24 Feb 2022 16:47:49 -0600 [thread overview]
Message-ID: <20220224224753.297579-8-helgaas@kernel.org> (raw)
In-Reply-To: <20220224224753.297579-1-helgaas@kernel.org>
From: Huacai Chen <chenhuacai@loongson.cn>
a37c0f48950b ("vgaarb: Select a default VGA device even if there's no
legacy VGA") extended the vga_arb_device_init() subsys_initcall so that if
there are no other eligible devices, it could select a disabled VGA device
as the default.
Move this detection from vga_arb_select_default_device() to
vga_arbiter_add_pci_device() so every device, even those hot-added or
enumerated after vga_arb_device_init() is eligible for selection as the
default VGA device.
[bhelgaas: commit log, restructure]
Link: https://lore.kernel.org/r/20211015061512.2941859-5-chenhuacai@loongson.cn
Signed-off-by: Huacai Chen <chenhuacai@kernel.org>
Cc: Daniel Axtens <dja@axtens.net>
Cc: Zhou Wang <wangzhou1@hisilicon.com>
---
drivers/pci/vgaarb.c | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index e36ccbfdbd89..e8d5efd85ba6 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -656,7 +656,8 @@ static bool vga_is_boot_device(struct vga_device *vgadev)
* We use the first one we find, so if we've already found one,
* vgadev is no better.
*/
- if (boot_vga)
+ if (boot_vga &&
+ (boot_vga->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)
return false;
if ((vgadev->owns & VGA_RSRC_LEGACY_MASK) == VGA_RSRC_LEGACY_MASK)
@@ -693,6 +694,13 @@ static bool vga_is_boot_device(struct vga_device *vgadev)
return true;
}
+ /*
+ * vgadev has neither IO nor MEM enabled. If we haven't found any
+ * other VGA devices, it is the best candidate so far.
+ */
+ if (!boot_vga)
+ return true;
+
return false;
}
@@ -1559,21 +1567,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 vga_device *vgadev;
-
- 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;
@@ -1603,8 +1596,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;
}
--
2.25.1
next prev parent reply other threads:[~2022-02-24 22:48 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-24 22:47 [PATCH v9 00/11] vgaarb: Rework default VGA device selection Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 01/11] PCI/VGA: Move vgaarb to drivers/pci Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 02/11] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 03/11] PCI/VGA: Factor out vga_select_framebuffer_device() Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 04/11] PCI/VGA: Factor out default VGA device selection Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 05/11] PCI/VGA: Move firmware default device detection to ADD_DEVICE path Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 06/11] PCI/VGA: Move non-legacy VGA " Bjorn Helgaas
2022-02-24 22:47 ` Bjorn Helgaas [this message]
2022-02-24 22:47 ` [PATCH v9 08/11] PCI/VGA: Remove empty vga_arb_device_card_gone() Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 09/11] PCI/VGA: Log bridge control messages when adding devices Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 10/11] PCI/VGA: Use unsigned format string to print lock counts Bjorn Helgaas
2022-02-24 22:47 ` [PATCH v9 11/11] PCI/VGA: Replace full MIT license text with SPDX identifier Bjorn Helgaas
2022-02-25 22:15 ` [PATCH v9 00/11] vgaarb: Rework default VGA device selection Bjorn Helgaas
2022-03-09 16:29 ` Bjorn Helgaas
2022-03-10 3:56 ` 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=20220224224753.297579-8-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=airlied@linux.ie \
--cc=chenhuacai@kernel.org \
--cc=chenhuacai@loongson.cn \
--cc=daniel@ffwll.ch \
--cc=dja@axtens.net \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=lixuefeng@loongson.cn \
--cc=maarten.lankhorst@linux.intel.com \
--cc=mripard@kernel.org \
--cc=tzimmermann@suse.de \
--cc=wangzhou1@hisilicon.com \
/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).