From 1f680609bf1beac20e2a31ddcb1b88874123c39f Mon Sep 17 00:00:00 2001

From: Yuchi Yang <yangyuchi66@gmail.com>

Date: Fri, 30 Dec 2022 15:22:25 +0800

Subject: [PATCH] ALSA: hda/realtek - Turn on power early

Git-commit: 1f680609bf1beac20e2a31ddcb1b88874123c39f

Patch-mainline: v6.2-rc4

References: git-fixes

Turn on power early to avoid wrong state for power relation register.

This can earlier update JD state when resume back.

Signed-off-by: Yuchi Yang <yangyuchi66@gmail.com>

Cc: <stable@vger.kernel.org>

Link: https://lore.kernel.org/r/e35d8f4fa18f4448a2315cc7d4a3715f@realtek.com

Signed-off-by: Takashi Iwai <tiwai@suse.de>

---

 sound/pci/hda/patch_realtek.c | 30 ++++++++++++++++--------------

 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c

index 3794b522c222..937b227e17c5 100644

--- a/sound/pci/hda/patch_realtek.c

+++ b/sound/pci/hda/patch_realtek.c

@@ -3564,6 +3564,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;

@@ -3575,14 +3584,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);

@@ -3713,6 +3714,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 (spec->codec_variant != ALC269_TYPE_ALC287 &&

 		spec->codec_variant != ALC269_TYPE_ALC245)

 		/* required only at boot or S3 and S4 resume time */

@@ -3734,12 +3742,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,

-- 

2.35.3