ALSA: hda - Workaround for silent output on VAIO Z with ALC889

On recent kernels, Realtek codec parser tries to optimize the routing
aggressively and take the headphone output as primary at first.  This
caused a regression on VAIO Z with ALC889, the silent output from the
speaker.

The problem seems that the speaker pin must be connected to the first
DAC (0x02) on this machine by some reason although the codec itself
advertises the flexible routing with any DACs.

This patch adds a fix-up for choosing the speaker pin as the primary
so that the right DAC is assigned on this device.

Reported-and-tested-by: Adam Williamson <awilliam@redhat.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>

2 files changed, 22 insertions, 1 deletions

diff --git a/Documentation/sound/alsa/HD-Audio-Models.txt b/Documentation/sound/alsa/HD-Audio-Models.txt
index 7456360e161c..0a2cdac96c28 100644
--- a/Documentation/sound/alsa/HD-Audio-Models.txt
+++ b/Documentation/sound/alsa/HD-Audio-Models.txt
@@ -53,6 +53,7 @@ ALC882/883/885/888/889
   acer-aspire-8930g     Acer Aspire 8330G/6935G
   acer-aspire           Acer Aspire others
   inv-dmic      Inverted internal mic workaround
+  no-primary-hp         VAIO Z workaround (for fixed speaker DAC)
 
 ALC861/660
 ==========
diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index f141395dfee6..344b221d2102 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -203,6 +203,7 @@ struct alc_spec {
         unsigned int shared_mic_hp:1; /* HP/Mic-in sharing */
         unsigned int inv_dmic_fixup:1; /* has inverted digital-mic workaround */
         unsigned int inv_dmic_muted:1; /* R-ch of inv d-mic is muted? */
+        unsigned int no_primary_hp:1; /* Don't prefer HP pins to speaker pins */
 
         /* auto-mute control */
         int automute_mode;
@@ -4323,7 +4324,8 @@ static int alc_parse_auto_config(struct hda_codec *codec,
                 return 0; /* can't find valid BIOS pin config */
         }
 
-        if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
+        if (!spec->no_primary_hp &&
+            cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
             cfg->line_outs <= cfg->hp_outs) {
                 /* use HP as primary out */
                 cfg->speaker_outs = cfg->line_outs;
@@ -5050,6 +5052,7 @@ enum {
         ALC889_FIXUP_MBP_VREF,
         ALC889_FIXUP_IMAC91_VREF,
         ALC882_FIXUP_INV_DMIC,
+        ALC882_FIXUP_NO_PRIMARY_HP,
 };
 
 static void alc889_fixup_coef(struct hda_codec *codec,
@@ -5171,6 +5174,17 @@ static void alc889_fixup_imac91_vref(struct hda_codec *codec,
         spec->keep_vref_in_automute = 1;
 }
 
+/* Don't take HP output as primary
+ * strangely, the speaker output doesn't work on VAIO Z through DAC 0x05
+ */
+static void alc882_fixup_no_primary_hp(struct hda_codec *codec,
+                                       const struct alc_fixup *fix, int action)
+{
+        struct alc_spec *spec = codec->spec;
+        if (action == ALC_FIXUP_ACT_PRE_PROBE)
+                spec->no_primary_hp = 1;
+}
+
 static const struct alc_fixup alc882_fixups[] = {
         [ALC882_FIXUP_ABIT_AW9D_MAX] = {
                 .type = ALC_FIXUP_PINS,
@@ -5357,6 +5371,10 @@ static const struct alc_fixup alc882_fixups[] = {
                 .type = ALC_FIXUP_FUNC,
                 .v.func = alc_fixup_inv_dmic_0x12,
         },
+        [ALC882_FIXUP_NO_PRIMARY_HP] = {
+                .type = ALC_FIXUP_FUNC,
+                .v.func = alc882_fixup_no_primary_hp,
+        },
 };
 
 static const struct snd_pci_quirk alc882_fixup_tbl[] = {
@@ -5391,6 +5409,7 @@ static const struct snd_pci_quirk alc882_fixup_tbl[] = {
         SND_PCI_QUIRK(0x1043, 0x1971, "Asus W2JC", ALC882_FIXUP_ASUS_W2JC),
         SND_PCI_QUIRK(0x1043, 0x835f, "Asus Eee 1601", ALC888_FIXUP_EEE1601),
         SND_PCI_QUIRK(0x104d, 0x9047, "Sony Vaio TT", ALC889_FIXUP_VAIO_TT),
+        SND_PCI_QUIRK(0x104d, 0x905a, "Sony Vaio Z", ALC882_FIXUP_NO_PRIMARY_HP),
 
         /* All Apple entries are in codec SSIDs */
         SND_PCI_QUIRK(0x106b, 0x00a0, "MacBookPro 3,1", ALC889_FIXUP_MBP_VREF),
@@ -5432,6 +5451,7 @@ static const struct alc_model_fixup alc882_fixup_models[] = {
         {.id = ALC882_FIXUP_ACER_ASPIRE_8930G, .name = "acer-aspire-8930g"},
         {.id = ALC883_FIXUP_ACER_EAPD, .name = "acer-aspire"},
         {.id = ALC882_FIXUP_INV_DMIC, .name = "inv-dmic"},
+        {.id = ALC882_FIXUP_NO_PRIMARY_HP, .name = "no-primary-hp"},
         {}
 };