Skip to content

Commit 3c088db

Browse files
kovalev0gregkh
authored andcommitted
ALSA: hda/conexant - Fix audio routing for HP EliteOne 1000 G2
commit 9988844 upstream. There is a problem with simultaneous audio output to headphones and speakers, and when headphones are turned off, the speakers also turn off and do not turn them on. However, it was found that if you boot linux immediately after windows, there are no such problems. When comparing alsa-info, the only difference is the different configuration of Node 0x1d: working conf. (windows): Pin-ctls: 0x80: HP not working (linux): Pin-ctls: 0xc0: OUT HP This patch disable the AC_PINCTL_OUT_EN bit of Node 0x1d and fixes the described problem. Signed-off-by: Vasiliy Kovalev <[email protected]> Cc: <[email protected]> Link: https://patch.msgid.link/[email protected] Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 5511999 commit 3c088db

File tree

1 file changed

+19
-0
lines changed

1 file changed

+19
-0
lines changed

sound/pci/hda/patch_conexant.c

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -307,6 +307,7 @@ enum {
307307
CXT_FIXUP_HP_SPECTRE,
308308
CXT_FIXUP_HP_GATE_MIC,
309309
CXT_FIXUP_MUTE_LED_GPIO,
310+
CXT_FIXUP_HP_ELITEONE_OUT_DIS,
310311
CXT_FIXUP_HP_ZBOOK_MUTE_LED,
311312
CXT_FIXUP_HEADSET_MIC,
312313
CXT_FIXUP_HP_MIC_NO_PRESENCE,
@@ -324,6 +325,19 @@ static void cxt_fixup_stereo_dmic(struct hda_codec *codec,
324325
spec->gen.inv_dmic_split = 1;
325326
}
326327

328+
/* fix widget control pin settings */
329+
static void cxt_fixup_update_pinctl(struct hda_codec *codec,
330+
const struct hda_fixup *fix, int action)
331+
{
332+
if (action == HDA_FIXUP_ACT_PROBE) {
333+
/* Unset OUT_EN for this Node pin, leaving only HP_EN.
334+
* This is the value stored in the codec register after
335+
* the correct initialization of the previous windows boot.
336+
*/
337+
snd_hda_set_pin_ctl(codec, 0x1d, AC_PINCTL_HP_EN);
338+
}
339+
}
340+
327341
static void cxt5066_increase_mic_boost(struct hda_codec *codec,
328342
const struct hda_fixup *fix, int action)
329343
{
@@ -975,6 +989,10 @@ static const struct hda_fixup cxt_fixups[] = {
975989
.type = HDA_FIXUP_FUNC,
976990
.v.func = cxt_fixup_mute_led_gpio,
977991
},
992+
[CXT_FIXUP_HP_ELITEONE_OUT_DIS] = {
993+
.type = HDA_FIXUP_FUNC,
994+
.v.func = cxt_fixup_update_pinctl,
995+
},
978996
[CXT_FIXUP_HP_ZBOOK_MUTE_LED] = {
979997
.type = HDA_FIXUP_FUNC,
980998
.v.func = cxt_fixup_hp_zbook_mute_led,
@@ -1065,6 +1083,7 @@ static const struct snd_pci_quirk cxt5066_fixups[] = {
10651083
SND_PCI_QUIRK(0x103c, 0x83b2, "HP EliteBook 840 G5", CXT_FIXUP_HP_DOCK),
10661084
SND_PCI_QUIRK(0x103c, 0x83b3, "HP EliteBook 830 G5", CXT_FIXUP_HP_DOCK),
10671085
SND_PCI_QUIRK(0x103c, 0x83d3, "HP ProBook 640 G4", CXT_FIXUP_HP_DOCK),
1086+
SND_PCI_QUIRK(0x103c, 0x83e5, "HP EliteOne 1000 G2", CXT_FIXUP_HP_ELITEONE_OUT_DIS),
10681087
SND_PCI_QUIRK(0x103c, 0x8402, "HP ProBook 645 G4", CXT_FIXUP_MUTE_LED_GPIO),
10691088
SND_PCI_QUIRK(0x103c, 0x8427, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),
10701089
SND_PCI_QUIRK(0x103c, 0x844f, "HP ZBook Studio G5", CXT_FIXUP_HP_ZBOOK_MUTE_LED),

0 commit comments

Comments
 (0)