From: Alex Deucher <alexdeucher@gmail.com>
To: amd-gfx@lists.freedesktop.org, alsa-devel@alsa-project.org,
tiwai@suse.de, lukas@wunner.de
Cc: Alex Deucher <alexander.deucher@amd.com>, Evan Quan <evan.quan@amd.com>
Subject: [alsa-devel] [PATCH 17/20] ALSA: hda/hdmi - fix vgaswitcheroo detection for AMD
Date: Fri, 15 Nov 2019 11:50:35 -0500 [thread overview]
Message-ID: <20191115165038.56646-18-alexander.deucher@amd.com> (raw)
In-Reply-To: <20191115165038.56646-1-alexander.deucher@amd.com>
Only enable the vga_switcheroo logic on systems with the
ATPX ACPI method. This logic is not needed for asics
that are not part of a PX (PowerXpress)/HG (Hybrid Graphics)
platform.
Reviewed-by: Takashi Iwai <tiwai@suse.de>
Acked-by: Evan Quan <evan.quan@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
---
sound/pci/hda/hda_intel.c | 45 +++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c
index 240f4ca76391..3ebc7b2a897f 100644
--- a/sound/pci/hda/hda_intel.c
+++ b/sound/pci/hda/hda_intel.c
@@ -35,6 +35,7 @@
#include <linux/clocksource.h>
#include <linux/time.h>
#include <linux/completion.h>
+#include <linux/acpi.h>
#ifdef CONFIG_X86
/* for snoop control */
@@ -1393,6 +1394,34 @@ static int azx_dev_free(struct snd_device *device)
}
#ifdef SUPPORT_VGA_SWITCHEROO
+#ifdef CONFIG_ACPI
+/* ATPX is in the integrated GPU's namespace */
+static bool atpx_present(void)
+{
+ struct pci_dev *pdev = NULL;
+ acpi_handle dhandle, atpx_handle;
+ acpi_status status;
+
+ while ((pdev = pci_get_class(PCI_BASE_CLASS_DISPLAY << 16, pdev)) != NULL) {
+ dhandle = ACPI_HANDLE(&pdev->dev);
+ if (dhandle) {
+ status = acpi_get_handle(dhandle, "ATPX", &atpx_handle);
+ if (!ACPI_FAILURE(status)) {
+ pci_dev_put(pdev);
+ return true;
+ }
+ }
+ pci_dev_put(pdev);
+ }
+ return false;
+}
+#else
+static bool atpx_present(void)
+{
+ return false;
+}
+#endif
+
/*
* Check of disabled HDMI controller by vga_switcheroo
*/
@@ -1404,6 +1433,22 @@ static struct pci_dev *get_bound_vga(struct pci_dev *pci)
switch (pci->vendor) {
case PCI_VENDOR_ID_ATI:
case PCI_VENDOR_ID_AMD:
+ if (pci->devfn == 1) {
+ p = pci_get_domain_bus_and_slot(pci_domain_nr(pci->bus),
+ pci->bus->number, 0);
+ if (p) {
+ /* ATPX is in the integrated GPU's ACPI namespace
+ * rather than the dGPU's namespace. However,
+ * the dGPU is the one who is involved in
+ * vgaswitcheroo.
+ */
+ if (((p->class >> 16) == PCI_BASE_CLASS_DISPLAY) &&
+ atpx_present())
+ return p;
+ pci_dev_put(p);
+ }
+ }
+ break;
case PCI_VENDOR_ID_NVIDIA:
if (pci->devfn == 1) {
p = pci_get_domain_bus_and_slot(pci_domain_nr(pci->bus),
--
2.23.0
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-11-15 17:03 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-15 16:50 [alsa-devel] [PATCH 00/20] Enable BACO for power savings (v3) Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 01/20] drm/amdgpu: add asic callback for BACO support Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 02/20] drm/amdgpu: add supports_baco callback for soc15 asics. (v2) Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 03/20] drm/amdgpu: add supports_baco callback for SI asics Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 04/20] drm/amdgpu: add supports_baco callback for CIK asics Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 05/20] drm/amdgpu: add supports_baco callback for VI asics Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 06/20] drm/amdgpu: add supports_baco callback for NV asics Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 07/20] drm/amdgpu: add a amdgpu_device_supports_baco helper Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 08/20] drm/amdgpu: rename amdgpu_device_is_px to amdgpu_device_supports_boco (v2) Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 09/20] drm/amdgpu: add additional boco checks to runtime suspend/resume (v2) Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 10/20] drm/amdgpu: split swSMU baco_reset into enter and exit Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 11/20] drm/amdgpu: add helpers for baco entry " Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 12/20] drm/amdgpu: add baco support to runtime suspend/resume Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 13/20] drm/amdgpu: start to disentangle boco from runtime pm Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 14/20] drm/amdgpu: disentangle runtime pm and vga_switcheroo Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 15/20] drm/amdgpu: enable runtime pm on BACO capable boards if runpm=1 Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 16/20] drm/amdgpu/runpm: enable runpm on baco capable VI+ asics (v2) Alex Deucher
2019-11-15 16:50 ` Alex Deucher [this message]
2019-11-15 16:50 ` [alsa-devel] [PATCH 18/20] ALSA: hda/hdmi - Add new pci ids for AMD GPU display audio Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 19/20] ALSA: hda/hdmi - enable runtime pm for newer AMD " Alex Deucher
2019-11-15 16:50 ` [alsa-devel] [PATCH 20/20] ALSA: hda/hdmi - enable automatic runtime pm for AMD HDMI codecs by default Alex Deucher
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=20191115165038.56646-18-alexander.deucher@amd.com \
--to=alexdeucher@gmail.com \
--cc=alexander.deucher@amd.com \
--cc=alsa-devel@alsa-project.org \
--cc=amd-gfx@lists.freedesktop.org \
--cc=evan.quan@amd.com \
--cc=lukas@wunner.de \
--cc=tiwai@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).