Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0e1dc65 authored by Kailang Yang's avatar Kailang Yang Committed by Greg Kroah-Hartman
Browse files

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



commit dad3197da7a3817f27bb24f7fd3c135ffa707202 upstream.

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: default avatarKailang Yang <kailang@realtek.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent ae315512

sound/pci/hda/patch_realtek.c

+35 −24
Original line number Diff line number Diff line
@@ -477,12 +477,45 @@ static void alc_auto_setup_eapd(struct hda_codec *codec, bool 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)

{

	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)

			snd_hda_shutup_pins(codec);

		break;

	}

}



/* generic shutup callback;
@@ -2923,27 +2956,6 @@ static int alc269_parse_auto_config(struct hda_codec *codec) 
	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)

{

	alc_update_coef_idx(codec, 0x04, 1 << 11, power_up ? (1 << 11) : 0);
@@ -7611,7 +7623,6 @@ static int patch_alc269(struct hda_codec *codec) 
	case 0x10ec0286:

	case 0x10ec0288:

		spec->codec_variant = ALC269_TYPE_ALC286;

		spec->shutup = alc286_shutup;

		break;

	case 0x10ec0298:

		spec->codec_variant = ALC269_TYPE_ALC298;