ALSA: hda/realtek: Update ALC256 depop procedure

Old procedure has a chance to meet Headphone no output.

Fixes: 4a219ef8f370 ("ALSA: hda/realtek - Add ALC256 HP depop function")
Signed-off-by: Kailang Yang <kailang@realtek.com>
Link: https://lore.kernel.org/463c5f93715d4714967041a0a8cec28e@realtek.com
Signed-off-by: Takashi Iwai <tiwai@suse.de>

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index 56a3622ca2c1e24530280d6e278a7650ae310579..c5dae2f90a45a159d9860b0dea955da90ab3f5c3 100644 (file)
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -3613,25 +3613,22 @@ static void alc256_init(struct hda_codec *codec)
 
        hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
 
-       if (hp_pin_sense)
+       if (hp_pin_sense) {
                msleep(2);
+               alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
 
-       alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
-
-       snd_hda_codec_write(codec, hp_pin, 0,
-                           AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
-
-       if (hp_pin_sense || spec->ultra_low_power)
-               msleep(85);
-
-       snd_hda_codec_write(codec, hp_pin, 0,
+               snd_hda_codec_write(codec, hp_pin, 0,
                            AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
 
-       if (hp_pin_sense || spec->ultra_low_power)
-               msleep(100);
+               msleep(75);
+
+               snd_hda_codec_write(codec, hp_pin, 0,
+                           AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE);
 
+               msleep(75);
+               alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
+       }
        alc_update_coef_idx(codec, 0x46, 3 << 12, 0);
-       alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x4); /* Hight power */
        alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 1 << 15); /* Clear bit */
        alc_update_coefex_idx(codec, 0x53, 0x02, 0x8000, 0 << 15);
        /*
@@ -3655,29 +3652,28 @@ static void alc256_shutup(struct hda_codec *codec)
        alc_update_coefex_idx(codec, 0x57, 0x04, 0x0007, 0x1); /* Low power */
        hp_pin_sense = snd_hda_jack_detect(codec, hp_pin);
 
-       if (hp_pin_sense)
+       if (hp_pin_sense) {
                msleep(2);
 
-       snd_hda_codec_write(codec, hp_pin, 0,
+               snd_hda_codec_write(codec, hp_pin, 0,
                            AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_MUTE);
 
-       if (hp_pin_sense || spec->ultra_low_power)
-               msleep(85);
+               msleep(75);
 
        /* 3k pull low control for Headset jack. */
        /* NOTE: call this before clearing the pin, otherwise codec stalls */
        /* If disable 3k pulldown control for alc257, the Mic detection will not work correctly
         * when booting with headset plugged. So skip setting it for the codec alc257
         */
-       if (spec->en_3kpull_low)
-               alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
+               if (spec->en_3kpull_low)
+                       alc_update_coef_idx(codec, 0x46, 0, 3 << 12);
 
-       if (!spec->no_shutup_pins)
-               snd_hda_codec_write(codec, hp_pin, 0,
+               if (!spec->no_shutup_pins)
+                       snd_hda_codec_write(codec, hp_pin, 0,
                                    AC_VERB_SET_PIN_WIDGET_CONTROL, 0x0);
 
-       if (hp_pin_sense || spec->ultra_low_power)
-               msleep(100);
+               msleep(75);
+       }
 
        alc_auto_setup_eapd(codec, false);
        alc_shutup_pins(codec);