Commit b3ebb007 authored by Takashi Iwai's avatar Takashi Iwai

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: 4178d78c ("ALSA: hda/conexant: Add pincfg quirk to enable top speakers on Sirius devices")
Reported-by: default avatarChristian Heusel <christian@heusel.eu>
Reported-by: default avatarJerry <jerryluo225@gmail.com>
Closes: https://lore.kernel.org/c930b6a6-64e5-498f-b65a-1cd5e0a1d733@heusel.eu
Link: https://patch.msgid.link/20241004082602.29016-1-tiwai@suse.deSigned-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 703235a2
...@@ -816,6 +816,23 @@ static const struct hda_pintbl cxt_pincfg_sws_js201d[] = { ...@@ -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[] = { static const struct hda_fixup cxt_fixups[] = {
[CXT_PINCFG_LENOVO_X200] = { [CXT_PINCFG_LENOVO_X200] = {
.type = HDA_FIXUP_PINS, .type = HDA_FIXUP_PINS,
...@@ -976,11 +993,8 @@ static const struct hda_fixup cxt_fixups[] = { ...@@ -976,11 +993,8 @@ static const struct hda_fixup cxt_fixups[] = {
.v.pins = cxt_pincfg_sws_js201d, .v.pins = cxt_pincfg_sws_js201d,
}, },
[CXT_PINCFG_TOP_SPEAKER] = { [CXT_PINCFG_TOP_SPEAKER] = {
.type = HDA_FIXUP_PINS, .type = HDA_FIXUP_FUNC,
.v.pins = (const struct hda_pintbl[]) { .v.func = cxt_fixup_sirius_top_speaker,
{ 0x1d, 0x82170111 },
{ }
},
}, },
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment