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

Commit 890792b5 authored by Yuchi Yang's avatar Yuchi Yang Committed by Greg Kroah-Hartman
Browse files

ALSA: hda/realtek - Turn on power early 



[ Upstream commit 1f680609bf1beac20e2a31ddcb1b88874123c39f ]

Turn on power early to avoid wrong state for power relation register.
This can earlier update JD state when resume back.

Signed-off-by: default avatarYuchi Yang <yangyuchi66@gmail.com>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/e35d8f4fa18f4448a2315cc7d4a3715f@realtek.com


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent e6073028

sound/pci/hda/patch_realtek.c

+16 −14
Original line number Diff line number Diff line
@@ -3503,6 +3503,15 @@ static void alc256_init(struct hda_codec *codec) 
	hda_nid_t hp_pin = alc_get_hp_pin(spec);

	bool hp_pin_sense;



	if (spec->ultra_low_power) {

		alc_update_coef_idx(codec, 0x03, 1<<1, 1<<1);

		alc_update_coef_idx(codec, 0x08, 3<<2, 3<<2);

		alc_update_coef_idx(codec, 0x08, 7<<4, 0);

		alc_update_coef_idx(codec, 0x3b, 1<<15, 0);

		alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);

		msleep(30);

	}



	if (!hp_pin)

		hp_pin = 0x21;
@@ -3514,14 +3523,6 @@ static void alc256_init(struct hda_codec *codec) 
		msleep(2);



	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */

	if (spec->ultra_low_power) {

		alc_update_coef_idx(codec, 0x03, 1<<1, 1<<1);

		alc_update_coef_idx(codec, 0x08, 3<<2, 3<<2);

		alc_update_coef_idx(codec, 0x08, 7<<4, 0);

		alc_update_coef_idx(codec, 0x3b, 1<<15, 0);

		alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);

		msleep(30);

	}



	snd_hda_codec_write(codec, hp_pin, 0,

			    AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
@@ -3603,6 +3604,13 @@ static void alc225_init(struct hda_codec *codec) 
	hda_nid_t hp_pin = alc_get_hp_pin(spec);

	bool hp1_pin_sense, hp2_pin_sense;



	if (spec->ultra_low_power) {

		alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2);

		alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);

		alc_update_coef_idx(codec, 0x33, 1<<11, 0);

		msleep(30);

	}



	if (!hp_pin)

		hp_pin = 0x21;

	msleep(30);
@@ -3614,12 +3622,6 @@ static void alc225_init(struct hda_codec *codec) 
		msleep(2);



	alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */

	if (spec->ultra_low_power) {

		alc_update_coef_idx(codec, 0x08, 0x0f << 2, 3<<2);

		alc_update_coef_idx(codec, 0x0e, 7<<6, 7<<6);

		alc_update_coef_idx(codec, 0x33, 1<<11, 0);

		msleep(30);

	}



	if (hp1_pin_sense || spec->ultra_low_power)

		snd_hda_codec_write(codec, hp_pin, 0,