Re: [REGRESSION][BISECTED] Audio volume issues since 4178d78cd7a8

[Takashi Iwai <tiwai@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 1776 bytes --]

On Wed, 02 Oct 2024 10:21:22 +0200,
Christoffer Sandberg wrote:
> 
> 
> 
> On 30.9.2024 09:44, Takashi Iwai wrote:
> > On Mon, 23 Sep 2024 21:37:42 +0200,
> > Jerry Luo wrote:
> >> 
> >> 
> >> Hi Takashi,
> >> 
> >> On Mon, 16 Sep 2024 19:22:05 +0200,
> >> 
> >> Takashi Iwai wrote:
> >> 
> >>     Could you give alsa-info.sh output from both working and
> >> non-working
> >>     cases?  Run the script with --no-upload option and attach the
> >> outputs.
> >> 
> >>     thanks,
> >> 
> >>     Takashi
> >> 
> >> Issue now reappear, output from alsa-info.sh are attached. If they
> >> are still
> >> needed.
> > 
> > Thanks.  The obvious difference seems to be the assignment of two DACs
> > 0x10 and 0x11 for headphone and speaker outputs.
> > 
> > Christoffer, how are those on your machines?
> 
> I attached alsa-info from the Sirius Gen2 device.
> 
> Comparing the working/nonworking of Jerry, yeah, the assignment of
> 0x10 and 0x11 looks switched around. I don't see what difference this
> would make. Also, node 0x22 has "bass speaker" controls in the
> non-working version.
> 
> Comparing the Sirius Gen2 alsa-info with Jerrys, to me it looks like
> the non-working version corresponds to our working version.
> 
> I would expect the non-working version to happen all the time though
> with regards to the "bass speaker" controls. Why would this only
> happen sometimes?

Thanks!  The assignment of DACs depend on the pins and topology, so it
can be a bit sensitive.

Now looking more closely at both outputs, I wonder how the commit
breaks pang14.  Maybe it has a PCI SSID 2782:12c5 (or 12c3) while the
codec SSID is 2782:12b3?  If so, the patch below should fix.

Could you guys try it and verify whether it fixes for Pangolin and
doesn't break Sirius?


Takashi



[-- Attachment #2: 0001-ALSA-hda-conexant-Fix-conflicting-quirk-for-System76.patch --]
[-- Type: application/octet-stream, Size: 2314 bytes --]

From d2323f9fce4a65639a7484accce8f500ca7186f0 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 2 Oct 2024 15:51:56 +0200
Subject: [PATCH] ALSA: hda/conexant: Fix conflicting quirk for System76
 Pangolin

We received a regression report for System76 Pangolin (pang14) due to
the recent fix for Tuxedo Sirius devices to support the top speaker.
The reason was the conflicting PCI SSID, as often seen.

As a workaround, now the codec SSID is checked and the quirk is
applied conditionally only to Sirius devices.

Fixes: 4178d78cd7a8 ("ALSA: hda/conexant: Add pincfg quirk to enable top speakers on Sirius devices")
Reported-by: Christian Heusel <christian@heusel.eu>
Reported-by: Jerry <jerryluo225@gmail.com>
Closes: https://lore.kernel.org/c930b6a6-64e5-498f-b65a-1cd5e0a1d733@heusel.eu
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
 sound/pci/hda/patch_conexant.c | 24 +++++++++++++++++++-----
 1 file changed, 19 insertions(+), 5 deletions(-)

diff --git a/sound/pci/hda/patch_conexant.c b/sound/pci/hda/patch_conexant.c
index ade42a8209c2..b61ce5e6f5ec 100644
--- a/sound/pci/hda/patch_conexant.c
+++ b/sound/pci/hda/patch_conexant.c
@@ -816,6 +816,23 @@ static const struct hda_pintbl cxt_pincfg_sws_js201d[] = {
 	{}
 };
 
+/* pincfg quirk for Tuxedo Sirius;
+ * unfortunately the (PCI) SSID conflicts with System76 Pangolin pang14,
+ * which has incompatible pin setup, so we check the codec SSID (luckily
+ * different one!) and conditionally apply the quirk here
+ */
+static void cxt_fixup_sirius_top_speaker(struct hda_codec *codec,
+					 const struct hda_fixup *fix,
+					 int action)
+{
+	/* ignore for incorrectly picked-up pang14 */
+	if (codec->core.subsystem_id == 0x278212b3)
+		return;
+	/* set up the top speaker pin */
+	if (action == HDA_FIXUP_ACT_PRE_PROBE)
+		snd_hda_codec_set_pincfg(codec, 0x1d, 0x82170111);
+}
+
 static const struct hda_fixup cxt_fixups[] = {
 	[CXT_PINCFG_LENOVO_X200] = {
 		.type = HDA_FIXUP_PINS,
@@ -976,11 +993,8 @@ static const struct hda_fixup cxt_fixups[] = {
 		.v.pins = cxt_pincfg_sws_js201d,
 	},
 	[CXT_PINCFG_TOP_SPEAKER] = {
-		.type = HDA_FIXUP_PINS,
-		.v.pins = (const struct hda_pintbl[]) {
-			{ 0x1d, 0x82170111 },
-			{ }
-		},
+		.type = HDA_FIXUP_FUNC,
+		.v.func = cxt_fixup_sirius_top_speaker,
 	},
 };
 
-- 
2.43.0