All of lore.kernel.org
 help / color / mirror / Atom feed
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 V3 5/9] PCI/VGA: Move vga_arb_integrated_gpu() earlier in file
Date: Fri, 20 Aug 2021 18:08:28 +0800	[thread overview]
Message-ID: <20210820100832.663931-6-chenhuacai@loongson.cn> (raw)
In-Reply-To: <20210820100832.663931-1-chenhuacai@loongson.cn>

Move vga_arb_integrated_gpu() earlier in file to prepare for future patch.
No functional change intended.

[bhelgaas: split to separate patch]
Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
---
 drivers/pci/vgaarb.c | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/drivers/pci/vgaarb.c b/drivers/pci/vgaarb.c
index c984c76b3fd7..1f8fb37be5fa 100644
--- a/drivers/pci/vgaarb.c
+++ b/drivers/pci/vgaarb.c
@@ -563,6 +563,20 @@ void vga_put(struct pci_dev *pdev, unsigned int rsrc)
 }
 EXPORT_SYMBOL(vga_put);
 
+#if defined(CONFIG_ACPI)
+static bool vga_arb_integrated_gpu(struct device *dev)
+{
+	struct acpi_device *adev = ACPI_COMPANION(dev);
+
+	return adev && !strcmp(acpi_device_hid(adev), ACPI_VIDEO_HID);
+}
+#else
+static bool vga_arb_integrated_gpu(struct device *dev)
+{
+	return false;
+}
+#endif
+
 /*
  * Rules for using a bridge to control a VGA descendant decoding: if a bridge
  * has only one VGA descendant then it can be used to control the VGA routing
@@ -1416,20 +1430,6 @@ static struct miscdevice vga_arb_device = {
 	MISC_DYNAMIC_MINOR, "vga_arbiter", &vga_arb_device_fops
 };
 
-#if defined(CONFIG_ACPI)
-static bool vga_arb_integrated_gpu(struct device *dev)
-{
-	struct acpi_device *adev = ACPI_COMPANION(dev);
-
-	return adev && !strcmp(acpi_device_hid(adev), ACPI_VIDEO_HID);
-}
-#else
-static bool vga_arb_integrated_gpu(struct device *dev)
-{
-	return false;
-}
-#endif
-
 static void __init vga_arb_select_default_device(void)
 {
 	struct pci_dev *pdev, *found = NULL;
-- 
2.27.0


  parent reply	other threads:[~2021-08-20 10:11 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-20 10:08 [PATCH V3 0/9] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-08-20 10:08 ` [PATCH V3 1/9] PCI/VGA: Move vgaarb to drivers/pci Huacai Chen
2021-08-21 20:48   ` kernel test robot
2021-08-20 10:08 ` [PATCH V3 2/9] PCI/VGA: Replace full MIT license text with SPDX identifier Huacai Chen
2021-08-20 10:08 ` [PATCH V3 3/9] PCI/VGA: Use unsigned format string to print lock counts Huacai Chen
2021-08-20 10:08 ` [PATCH V3 4/9] PCI/VGA: Remove empty vga_arb_device_card_gone() Huacai Chen
2021-08-20 10:08 ` Huacai Chen [this message]
2021-08-20 10:08 ` [PATCH V3 6/9] PCI/VGA: Prefer vga_default_device() Huacai Chen
2021-08-20 10:08 ` [PATCH V3 7/9] PCI/VGA: Split out vga_arb_update_default_device() Huacai Chen
2021-08-20 10:08 ` [PATCH V3 8/9] PCI/VGA: Log bridge control messages when adding devices Huacai Chen
2021-08-20 10:08 ` [PATCH V3 9/9] PCI/VGA: Rework default VGA device selection Huacai Chen
2021-08-25 20:17 ` [PATCH V3 0/9] " Bjorn Helgaas
2021-08-27  4:24   ` Huacai Chen
2021-08-27  4:24     ` 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=20210820100832.663931-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.