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
Subject: [PATCH v9 09/11] PCI/VGA: Log bridge control messages when adding devices
Date: Thu, 24 Feb 2022 16:47:51 -0600 [thread overview]
Message-ID: <20220224224753.297579-10-helgaas@kernel.org> (raw)
In-Reply-To: <20220224224753.297579-1-helgaas@kernel.org>
From: Huacai Chen <chenhuacai@loongson.cn>
Previously vga_arb_device_init() iterated through all VGA devices and
indicated whether legacy VGA routing to each could be controlled by an
upstream bridge.
But we determine that information in vga_arbiter_add_pci_device(), which we
call for every device, so we can log it there without iterating through the
VGA devices again.
Note that we call vga_arbiter_check_bridge_sharing() before adding the
device to vga_list, so we have to handle the very first device separately.
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
drivers/pci/vgaarb.c | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index 582f0054b71a..7b1bfdea9d10 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -719,8 +719,10 @@ static void vga_arbiter_check_bridge_sharing(struct vga_device *vgadev)
vgadev->bridge_has_one_vga = true;
- if (list_empty(&vga_list))
+ if (list_empty(&vga_list)) {
+ vgaarb_info(&vgadev->pdev->dev, "bridge control possible\n");
return;
+ }
/* okay iterate the new devices bridge hierarachy */
new_bus = vgadev->pdev->bus;
@@ -759,6 +761,11 @@ static void vga_arbiter_check_bridge_sharing(struct vga_device *vgadev)
}
new_bus = new_bus->parent;
}
+
+ if (vgadev->bridge_has_one_vga)
+ vgaarb_info(&vgadev->pdev->dev, "bridge control possible\n");
+ else
+ vgaarb_info(&vgadev->pdev->dev, "no bridge control possible\n");
}
/*
@@ -1557,7 +1564,6 @@ static int __init vga_arb_device_init(void)
{
int rc;
struct pci_dev *pdev;
- struct vga_device *vgadev;
rc = misc_register(&vga_arb_device);
if (rc < 0)
@@ -1573,15 +1579,6 @@ static int __init vga_arb_device_init(void)
PCI_ANY_ID, pdev)) != NULL)
vga_arbiter_add_pci_device(pdev);
- list_for_each_entry(vgadev, &vga_list, list) {
- struct device *dev = &vgadev->pdev->dev;
-
- if (vgadev->bridge_has_one_vga)
- vgaarb_info(dev, "bridge control possible\n");
- else
- vgaarb_info(dev, "no bridge control possible\n");
- }
-
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 ` [PATCH v9 07/11] PCI/VGA: Move disabled VGA device " Bjorn Helgaas
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 ` Bjorn Helgaas [this message]
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-10-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=airlied@linux.ie \
--cc=chenhuacai@loongson.cn \
--cc=daniel@ffwll.ch \
--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 \
/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).