hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda - Fix power-map regression for HP dv6 & co 

The recent fix for power-map controls (commit b0791dda81) caused
regressions on some other HP laptops.  They have fixed pins but these
pins are exposed as jack-detectable.  Thus the driver tries to control
the power-map dynamically per jack detection where it never gets on.

This patch adds the check of connection and it assumes the no jack
detection is available for fixed pins no matter what pin capability
says.

BugLink: http://bugs.launchpad.net/bugs/1013183
Reported-by: Luis Henriques <luis.henriques@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai 2012-06-26 17:35:10 +02:00
parent 09a6071bfe
commit 6e1c39c6b0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sound/pci/hda/patch_sigmatel.c
View File

@ -4367,7 +4367,7 @@ static int stac92xx_init(struct hda_codec *codec)
AC_PINCTL_IN_EN); AC_PINCTL_IN_EN);
for (i = 0; i < spec->num_pwrs; i++) { for (i = 0; i < spec->num_pwrs; i++) {
hda_nid_t nid = spec->pwr_nids[i]; hda_nid_t nid = spec->pwr_nids[i];
int pinctl, def_conf; unsigned int pinctl, def_conf;
def_conf = snd_hda_codec_get_pincfg(codec, nid); def_conf = snd_hda_codec_get_pincfg(codec, nid);
def_conf = get_defcfg_connect(def_conf); def_conf = get_defcfg_connect(def_conf);
@ -4376,6 +4376,11 @@ static int stac92xx_init(struct hda_codec *codec)
stac_toggle_power_map(codec, nid, 0); stac_toggle_power_map(codec, nid, 0);
continue; continue;
} }
if (def_conf == AC_JACK_PORT_FIXED) {
/* no need for jack detection for fixed pins */
stac_toggle_power_map(codec, nid, 1);
continue;
}
/* power on when no jack detection is available */ /* power on when no jack detection is available */
/* or when the VREF is used for controlling LED */ /* or when the VREF is used for controlling LED */
if (!spec->hp_detect || if (!spec->hp_detect ||