1 files changed, 64 insertions, 23 deletions

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 0db1dc49382b..1358987c49d8 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -177,6 +177,7 @@ struct alc_spec {
         unsigned int detect_lo:1;       /* Line-out detection enabled */
         unsigned int automute_speaker_possible:1; /* there are speakers and either LO or HP */
         unsigned int automute_lo_possible:1;      /* there are line outs and HP */
+        unsigned int keep_vref_in_automute:1; /* Don't clear VREF in automute */
 
         /* other flags */
         unsigned int no_analog :1; /* digital I/O only */
@@ -495,13 +496,24 @@ static void do_automute(struct hda_codec *codec, int num_pins, hda_nid_t *pins,
 
         for (i = 0; i < num_pins; i++) {
                 hda_nid_t nid = pins[i];
+                unsigned int val;
                 if (!nid)
                         break;
                 switch (spec->automute_mode) {
                 case ALC_AUTOMUTE_PIN:
+                        /* don't reset VREF value in case it's controlling
+                         * the amp (see alc861_fixup_asus_amp_vref_0f())
+                         */
+                        if (spec->keep_vref_in_automute) {
+                                val = snd_hda_codec_read(codec, nid, 0,
+                                        AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+                                val &= ~PIN_HP;
+                        } else
+                                val = 0;
+                        val |= pin_bits;
                         snd_hda_codec_write(codec, nid, 0,
                                             AC_VERB_SET_PIN_WIDGET_CONTROL,
-                                            pin_bits);
+                                            val);
                         break;
                 case ALC_AUTOMUTE_AMP:
                         snd_hda_codec_amp_stereo(codec, nid, HDA_OUTPUT, 0,
@@ -1843,6 +1855,8 @@ static const char * const alc_slave_vols[] = {
         "Speaker Playback Volume",
         "Mono Playback Volume",
         "Line-Out Playback Volume",
+        "CLFE Playback Volume",
+        "Bass Speaker Playback Volume",
         "PCM Playback Volume",
         NULL,
 };
@@ -1858,6 +1872,8 @@ static const char * const alc_slave_sws[] = {
         "Mono Playback Switch",
         "IEC958 Playback Switch",
         "Line-Out Playback Switch",
+        "CLFE Playback Switch",
+        "Bass Speaker Playback Switch",
         "PCM Playback Switch",
         NULL,
 };
@@ -2306,7 +2322,7 @@ static int alc_build_pcms(struct hda_codec *codec)
                  "%s Analog", codec->chip_name);
         info->name = spec->stream_name_analog;
 
-        if (spec->multiout.dac_nids > 0) {
+        if (spec->multiout.num_dacs > 0) {
                 p = spec->stream_analog_playback;
                 if (!p)
                         p = &alc_pcm_analog_playback;
@@ -4358,6 +4374,7 @@ enum {
         ALC882_FIXUP_ACER_ASPIRE_8930G,
         ALC882_FIXUP_ASPIRE_8930G_VERBS,
         ALC885_FIXUP_MACPRO_GPIO,
+        ALC889_FIXUP_DAC_ROUTE,
 };
 
 static void alc889_fixup_coef(struct hda_codec *codec,
@@ -4411,6 +4428,23 @@ static void alc885_fixup_macpro_gpio(struct hda_codec *codec,
         alc882_gpio_mute(codec, 1, 0);
 }
 
+/* Fix the connection of some pins for ALC889:
+ * At least, Acer Aspire 5935 shows the connections to DAC3/4 don't
+ * work correctly (bko#42740)
+ */
+static void alc889_fixup_dac_route(struct hda_codec *codec,
+                                   const struct alc_fixup *fix, int action)
+{
+        if (action == ALC_FIXUP_ACT_PRE_PROBE) {
+                hda_nid_t conn1[2] = { 0x0c, 0x0d };
+                hda_nid_t conn2[2] = { 0x0e, 0x0f };
+                snd_hda_override_conn_list(codec, 0x14, 2, conn1);
+                snd_hda_override_conn_list(codec, 0x15, 2, conn1);
+                snd_hda_override_conn_list(codec, 0x18, 2, conn2);
+                snd_hda_override_conn_list(codec, 0x1a, 2, conn2);
+        }
+}
+
 static const struct alc_fixup alc882_fixups[] = {
         [ALC882_FIXUP_ABIT_AW9D_MAX] = {
                 .type = ALC_FIXUP_PINS,
@@ -4558,6 +4592,10 @@ static const struct alc_fixup alc882_fixups[] = {
                 .type = ALC_FIXUP_FUNC,
                 .v.func = alc885_fixup_macpro_gpio,
         },
+        [ALC889_FIXUP_DAC_ROUTE] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc889_fixup_dac_route,
+        },
 };
 
 static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -4582,6 +4620,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1025, 0x0142, "Acer Aspire 7730G",
                       ALC882_FIXUP_ACER_ASPIRE_4930G),
         SND_PCI_QUIRK(0x1025, 0x0155, "Packard-Bell M5120", ALC882_FIXUP_PB_M5210),
+        SND_PCI_QUIRK(0x1025, 0x0259, "Acer Aspire 5935", ALC889_FIXUP_DAC_ROUTE),
         SND_PCI_QUIRK(0x1025, 0x0296, "Acer Aspire 7736z", ALC882_FIXUP_ACER_ASPIRE_7736),
         SND_PCI_QUIRK(0x1043, 0x13c2, "Asus A7M", ALC882_FIXUP_EAPD),
         SND_PCI_QUIRK(0x1043, 0x1873, "ASUS W90V", ALC882_FIXUP_ASUS_W90V),
@@ -4735,7 +4774,6 @@ enum {
         ALC262_FIXUP_FSC_H270,
         ALC262_FIXUP_HP_Z200,
         ALC262_FIXUP_TYAN,
-        ALC262_FIXUP_TOSHIBA_RX1,
         ALC262_FIXUP_LENOVO_3000,
         ALC262_FIXUP_BENQ,
         ALC262_FIXUP_BENQ_T31,
@@ -4765,16 +4803,6 @@ static const struct alc_fixup alc262_fixups[] = {
                         { }
                 }
         },
-        [ALC262_FIXUP_TOSHIBA_RX1] = {
-                .type = ALC_FIXUP_PINS,
-                .v.pins = (const struct alc_pincfg[]) {
-                        { 0x14, 0x90170110 }, /* speaker */
-                        { 0x15, 0x0421101f }, /* HP */
-                        { 0x1a, 0x40f000f0 }, /* N/A */
-                        { 0x1b, 0x40f000f0 }, /* N/A */
-                        { 0x1e, 0x40f000f0 }, /* N/A */
-                }
-        },
         [ALC262_FIXUP_LENOVO_3000] = {
                 .type = ALC_FIXUP_VERBS,
                 .v.verbs = (const struct hda_verb[]) {
@@ -4807,8 +4835,6 @@ static const struct snd_pci_quirk alc262_fixup_tbl[] = {
         SND_PCI_QUIRK(0x10cf, 0x1397, "Fujitsu", ALC262_FIXUP_BENQ),
         SND_PCI_QUIRK(0x10cf, 0x142d, "Fujitsu Lifebook E8410", ALC262_FIXUP_BENQ),
         SND_PCI_QUIRK(0x10f1, 0x2915, "Tyan Thunder n6650W", ALC262_FIXUP_TYAN),
-        SND_PCI_QUIRK(0x1179, 0x0001, "Toshiba dynabook SS RX1",
-                      ALC262_FIXUP_TOSHIBA_RX1),
         SND_PCI_QUIRK(0x1734, 0x1147, "FSC Celsius H270", ALC262_FIXUP_FSC_H270),
         SND_PCI_QUIRK(0x17aa, 0x384e, "Lenovo 3000", ALC262_FIXUP_LENOVO_3000),
         SND_PCI_QUIRK(0x17ff, 0x0560, "Benq ED8", ALC262_FIXUP_BENQ),
@@ -5377,7 +5403,6 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x8330, "ASUS Eeepc P703 P900A",
                       ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1013, "ASUS N61Da", ALC269_FIXUP_AMIC),
-        SND_PCI_QUIRK(0x1043, 0x1113, "ASUS N63Jn", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1143, "ASUS B53f", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1133, "ASUS UJ20ft", ALC269_FIXUP_AMIC),
         SND_PCI_QUIRK(0x1043, 0x1183, "ASUS K72DR", ALC269_FIXUP_AMIC),
@@ -5589,6 +5614,25 @@ enum {
         PINFIX_ASUS_A6RP,
 };
 
+/* On some laptops, VREF of pin 0x0f is abused for controlling the main amp */
+static void alc861_fixup_asus_amp_vref_0f(struct hda_codec *codec,
+                        const struct alc_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        unsigned int val;
+
+        if (action != ALC_FIXUP_ACT_INIT)
+                return;
+        val = snd_hda_codec_read(codec, 0x0f, 0,
+                                 AC_VERB_GET_PIN_WIDGET_CONTROL, 0);
+        if (!(val & (AC_PINCTL_IN_EN | AC_PINCTL_OUT_EN)))
+                val |= AC_PINCTL_IN_EN;
+        val |= AC_PINCTL_VREF_50;
+        snd_hda_codec_write(codec, 0x0f, 0,
+                            AC_VERB_SET_PIN_WIDGET_CONTROL, val);
+        spec->keep_vref_in_automute = 1;
+}
+
 static const struct alc_fixup alc861_fixups[] = {
         [PINFIX_FSC_AMILO_PI1505] = {
                 .type = ALC_FIXUP_PINS,
@@ -5599,17 +5643,14 @@ static const struct alc_fixup alc861_fixups[] = {
                 }
         },
         [PINFIX_ASUS_A6RP] = {
-                .type = ALC_FIXUP_VERBS,
-                .v.verbs = (const struct hda_verb[]) {
-                        /* node 0x0f VREF seems controlling the master output */
-                        { 0x0f, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_VREF50 },
-                        { }
-                },
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc861_fixup_asus_amp_vref_0f,
         },
 };
 
 static const struct snd_pci_quirk alc861_fixup_tbl[] = {
-        SND_PCI_QUIRK(0x1043, 0x1393, "ASUS A6Rp", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK_VENDOR(0x1043, "ASUS laptop", PINFIX_ASUS_A6RP),
+        SND_PCI_QUIRK(0x1584, 0x0000, "Uniwill ECS M31EI", PINFIX_ASUS_A6RP),   
         SND_PCI_QUIRK(0x1584, 0x2b01, "Haier W18", PINFIX_ASUS_A6RP),
         SND_PCI_QUIRK(0x1734, 0x10c7, "FSC Amilo Pi1505", PINFIX_FSC_AMILO_PI1505),
         {}