Bug#658294: [3.1 -> 3.2.2 regression] No more sound
forwarded 658294 https://bugzilla.kernel.org/show_bug.cgi?id=42637
tags 658294 + upstream patch fixed-upstream
quit
Guy Roussin wrote:
> yes i notice the trouble is *only* with "dock lineout" and kernel 3.2.
> No problem with "integrated loudspeaker" or "laptop lineout".
> I also test kernel 3.3rc2 and is fine with "dock lineout", "integrated
> loudspeaker" and "laptop lineout"
Excellent. I've attached the relevant patch --- already tested and
accepted upstream, so unless you want to test it I see no need to.
The patch is part of v3.3-rc2 and has been queued by Greg for
inclusion in version 3.2.3.
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 23 Jan 2012 18:23:36 +0100
Subject: ALSA: hda - Fix silent outputs from docking-station jacks of Dell laptops
commit b4ead019afc201f71c39cd0dfcaafed4a97b3dd2 upstream.
The recent change of the power-widget handling for IDT codecs caused
the silent output from the docking-station line-out jack. This was
partially fixed by the commit f2cbba7602383cd9cdd21f0a5d0b8bd1aad47b33
"ALSA: hda - Fix the lost power-setup of seconary pins after PM resume".
But the line-out on the docking-station is still silent when booted
with the jack plugged even by this fix.
The remainig bug is that the power-widget is set off in stac92xx_init()
because the pins in cfg->line_out_pins[] aren't checked there properly
but only hp_pins[] are checked in is_nid_hp_pin().
This patch fixes the problem by checking both HP and line-out pins
and leaving the power-map correctly.
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42637
Cc: <stable@kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
sound/pci/hda/patch_sigmatel.c | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/sound/pci/hda/patch_sigmatel.c b/sound/pci/hda/patch_sigmatel.c
index f3c73a93429b..2141cab8cc98 100644
--- a/sound/pci/hda/patch_sigmatel.c
+++ b/sound/pci/hda/patch_sigmatel.c
@@ -4253,13 +4253,15 @@ static int enable_pin_detect(struct hda_codec *codec, hda_nid_t nid,
return 1;
}
-static int is_nid_hp_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
+static int is_nid_out_jack_pin(struct auto_pin_cfg *cfg, hda_nid_t nid)
{
int i;
for (i = 0; i < cfg->hp_outs; i++)
if (cfg->hp_pins[i] == nid)
return 1; /* nid is a HP-Out */
-
+ for (i = 0; i < cfg->line_outs; i++)
+ if (cfg->line_out_pins[i] == nid)
+ return 1; /* nid is a line-Out */
return 0; /* nid is not a HP-Out */
};
@@ -4465,7 +4467,7 @@ static int stac92xx_init(struct hda_codec *codec)
continue;
}
- if (is_nid_hp_pin(cfg, nid))
+ if (is_nid_out_jack_pin(cfg, nid))
continue; /* already has an unsol event */
pinctl = snd_hda_codec_read(codec, nid, 0,
--
1.7.9
Reply to: