leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ALSA: hda/realtek - Fixup headphone noise via runtime suspend

Browse Source 
Dell platform with ALC298.
system enter to runtime suspend. Headphone had noise.
Let Headset Mic not shutup will solve this issue.

[ Fixed minor coding style issues by tiwai ]

Signed-off-by: Kailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Kailang Yang 2019-05-10 16:28:57 +08:00 committed by Takashi Iwai
parent ed97c988bd
commit dad3197da7
1 changed files with 35 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
sound/pci/hda/patch_realtek.c
View File

@ -478,12 +478,45 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool on)
set_eapd(codec, *p, on); set_eapd(codec, *p, on);
} }
static int find_ext_mic_pin(struct hda_codec *codec);
static void alc_headset_mic_no_shutup(struct hda_codec *codec)
{
const struct hda_pincfg *pin;
int mic_pin = find_ext_mic_pin(codec);
int i;
/* don't shut up pins when unloading the driver; otherwise it breaks
* the default pin setup at the next load of the driver
*/
if (codec->bus->shutdown)
return;
snd_array_for_each(&codec->init_pins, i, pin) {
/* use read here for syncing after issuing each verb */
if (pin->nid != mic_pin)
snd_hda_codec_read(codec, pin->nid, 0,
AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
}
codec->pins_shutup = 1;
}
static void alc_shutup_pins(struct hda_codec *codec) static void alc_shutup_pins(struct hda_codec *codec)
{ {
struct alc_spec *spec = codec->spec; struct alc_spec *spec = codec->spec;
switch (codec->core.vendor_id) {
case 0x10ec0286:
case 0x10ec0288:
case 0x10ec0298:
alc_headset_mic_no_shutup(codec);
break;
default:
if (!spec->no_shutup_pins) if (!spec->no_shutup_pins)
snd_hda_shutup_pins(codec); snd_hda_shutup_pins(codec);
break;
}
} }
/* generic shutup callback; /* generic shutup callback;
@ -2924,27 +2957,6 @@ static int alc269_parse_auto_config(struct hda_codec *codec)
return alc_parse_auto_config(codec, alc269_ignore, ssids); return alc_parse_auto_config(codec, alc269_ignore, ssids);
} }
static int find_ext_mic_pin(struct hda_codec *codec);
static void alc286_shutup(struct hda_codec *codec)
{
const struct hda_pincfg *pin;
int i;
int mic_pin = find_ext_mic_pin(codec);
/* don't shut up pins when unloading the driver; otherwise it breaks
* the default pin setup at the next load of the driver
*/
if (codec->bus->shutdown)
return;
snd_array_for_each(&codec->init_pins, i, pin) {
/* use read here for syncing after issuing each verb */
if (pin->nid != mic_pin)
snd_hda_codec_read(codec, pin->nid, 0,
AC_VERB_SET_PIN_WIDGET_CONTROL, 0);
}
codec->pins_shutup = 1;
}
static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up) static void alc269vb_toggle_power_output(struct hda_codec *codec, int power_up)
{ {
alc_update_coef_idx(codec, 0x04, 1 << 11, power_up ? (1 << 11) : 0); alc_update_coef_idx(codec, 0x04, 1 << 11, power_up ? (1 << 11) : 0);
@ -7736,7 +7748,6 @@ static int patch_alc269(struct hda_codec *codec)
case 0x10ec0286: case 0x10ec0286:
case 0x10ec0288: case 0x10ec0288:
spec->codec_variant = ALC269_TYPE_ALC286; spec->codec_variant = ALC269_TYPE_ALC286;
spec->shutup = alc286_shutup;
break; break;
case 0x10ec0298: case 0x10ec0298:
spec->codec_variant = ALC269_TYPE_ALC298; spec->codec_variant = ALC269_TYPE_ALC298;