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

Commit e58ba88d authored by Hui Wang's avatar Hui Wang Committed by Greg Kroah-Hartman
Browse files

ALSA: hda - Add a generic reboot_notify 



commit 871b9066027702e6e6589da0e1edd3b7dede7205 upstream.

Make codec enter D3 before rebooting or poweroff can fix the noise
issue on some laptops. And in theory it is harmless for all codecs
to enter D3 before rebooting or poweroff, let us add a generic
reboot_notify, then realtek and conexant drivers can call this
function.

Cc: stable@vger.kernel.org
Signed-off-by: default avatarHui Wang <hui.wang@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6c4a536c

sound/pci/hda/hda_generic.c

+19 −0
Original line number Diff line number Diff line
@@ -6033,6 +6033,24 @@ void snd_hda_gen_free(struct hda_codec *codec) 
}

EXPORT_SYMBOL_GPL(snd_hda_gen_free);



/**

 * snd_hda_gen_reboot_notify - Make codec enter D3 before rebooting

 * @codec: the HDA codec

 *

 * This can be put as patch_ops reboot_notify function.

 */

void snd_hda_gen_reboot_notify(struct hda_codec *codec)

{

	/* Make the codec enter D3 to avoid spurious noises from the internal

	 * speaker during (and after) reboot

	 */

	snd_hda_codec_set_power_to_all(codec, codec->core.afg, AC_PWRST_D3);

	snd_hda_codec_write(codec, codec->core.afg, 0,

			    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);

	msleep(10);

}

EXPORT_SYMBOL_GPL(snd_hda_gen_reboot_notify);



#ifdef CONFIG_PM

/**

 * snd_hda_gen_check_power_status - check the loopback power save state
@@ -6060,6 +6078,7 @@ static const struct hda_codec_ops generic_patch_ops = { 
	.init = snd_hda_gen_init,

	.free = snd_hda_gen_free,

	.unsol_event = snd_hda_jack_unsol_event,

	.reboot_notify = snd_hda_gen_reboot_notify,

#ifdef CONFIG_PM

	.check_power_status = snd_hda_gen_check_power_status,

#endif

sound/pci/hda/hda_generic.h

+1 −0
Original line number Diff line number Diff line
@@ -336,6 +336,7 @@ int snd_hda_gen_parse_auto_config(struct hda_codec *codec, 
				  struct auto_pin_cfg *cfg);

int snd_hda_gen_build_controls(struct hda_codec *codec);

int snd_hda_gen_build_pcms(struct hda_codec *codec);

void snd_hda_gen_reboot_notify(struct hda_codec *codec);



/* standard jack event callbacks */

void snd_hda_gen_hp_automute(struct hda_codec *codec,

sound/pci/hda/patch_conexant.c

+1 −5
Original line number Diff line number Diff line
@@ -188,11 +188,7 @@ static void cx_auto_reboot_notify(struct hda_codec *codec) 
	/* Turn the problematic codec into D3 to avoid spurious noises

	   from the internal speaker during (and after) reboot */

	cx_auto_turn_eapd(codec, spec->num_eapds, spec->eapds, false);



	snd_hda_codec_set_power_to_all(codec, codec->core.afg, AC_PWRST_D3);

	snd_hda_codec_write(codec, codec->core.afg, 0,

			    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);

	msleep(10);

	snd_hda_gen_reboot_notify(codec);

}



static void cx_auto_free(struct hda_codec *codec)

sound/pci/hda/patch_realtek.c

+1 −10
Original line number Diff line number Diff line
@@ -868,15 +868,6 @@ static void alc_reboot_notify(struct hda_codec *codec) 
		alc_shutup(codec);

}



/* power down codec to D3 at reboot/shutdown; set as reboot_notify ops */

static void alc_d3_at_reboot(struct hda_codec *codec)

{

	snd_hda_codec_set_power_to_all(codec, codec->core.afg, AC_PWRST_D3);

	snd_hda_codec_write(codec, codec->core.afg, 0,

			    AC_VERB_SET_POWER_STATE, AC_PWRST_D3);

	msleep(10);

}



#define alc_free	snd_hda_gen_free



#ifdef CONFIG_PM
@@ -5111,7 +5102,7 @@ static void alc_fixup_tpt440_dock(struct hda_codec *codec, 
	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE) {

		spec->reboot_notify = alc_d3_at_reboot; /* reduce noise */

		spec->reboot_notify = snd_hda_gen_reboot_notify; /* reduce noise */

		spec->parse_flags = HDA_PINCFG_NO_HP_FIXUP;

		codec->power_save_node = 0; /* avoid click noises */

		snd_hda_apply_pincfgs(codec, pincfgs);