Commit a6919f2a authored by Sean Rhodes's avatar Sean Rhodes Committed by Takashi Iwai
Browse files

ALSA: hda/realtek: Sequence GPIO2 on Star Labs StarFighter 



The initial StarFighter quirk fixed the runtime suspend pop by muting
speakers in the shutup callback before power-down. Further hardware
validation showed that the speaker path is controlled directly by LINE2
EAPD on NID 0x1b together with GPIO2 for the external amplifier.

Replace the shutup-delay workaround with explicit sequencing of those
controls at playback start and stop:
- assert LINE2 EAPD and drive GPIO2 high on PREPARE
- deassert LINE2 EAPD and drive GPIO2 low on CLEANUP

This avoids the runtime suspend pop without a sleep, and also fixes pops
around G3 entry and display-manager start that the original workaround
did not cover.

Fixes: 1cb3c206 ("ALSA: hda/realtek: Fix speaker pop on Star Labs StarFighter")
Tested-by: default avatarSean Rhodes <sean@starlabs.systems>
Signed-off-by: default avatarSean Rhodes <sean@starlabs.systems>
Link: https://patch.msgid.link/20260315201127.33744-1-sean@starlabs.systems


Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 793b008c

sound/hda/codecs/realtek/alc269.c

+32 −6
Original line number Diff line number Diff line
@@ -1017,12 +1017,30 @@ static int alc269_resume(struct hda_codec *codec) 
	return 0;

}



#define STARLABS_STARFIGHTER_SHUTUP_DELAY_MS	30

#define ALC233_STARFIGHTER_SPK_PIN	0x1b

#define ALC233_STARFIGHTER_GPIO2	0x04



static void starlabs_starfighter_shutup(struct hda_codec *codec)

static void alc233_starfighter_update_amp(struct hda_codec *codec, bool on)

{

	if (snd_hda_gen_shutup_speakers(codec))

		msleep(STARLABS_STARFIGHTER_SHUTUP_DELAY_MS);

	snd_hda_codec_write(codec, ALC233_STARFIGHTER_SPK_PIN, 0,

			    AC_VERB_SET_EAPD_BTLENABLE,

			    on ? AC_EAPDBTL_EAPD : 0);

	alc_update_gpio_data(codec, ALC233_STARFIGHTER_GPIO2, on);

}



static void alc233_starfighter_pcm_hook(struct hda_pcm_stream *hinfo,

					struct hda_codec *codec,

					struct snd_pcm_substream *substream,

					int action)

{

	switch (action) {

	case HDA_GEN_PCM_ACT_PREPARE:

		alc233_starfighter_update_amp(codec, true);

		break;

	case HDA_GEN_PCM_ACT_CLEANUP:

		alc233_starfighter_update_amp(codec, false);

		break;

	}

}



static void alc233_fixup_starlabs_starfighter(struct hda_codec *codec,
@@ -1031,8 +1049,16 @@ static void alc233_fixup_starlabs_starfighter(struct hda_codec *codec, 
{

	struct alc_spec *spec = codec->spec;



	if (action == HDA_FIXUP_ACT_PRE_PROBE)

		spec->shutup = starlabs_starfighter_shutup;

	switch (action) {

	case HDA_FIXUP_ACT_PRE_PROBE:

		spec->gpio_mask |= ALC233_STARFIGHTER_GPIO2;

		spec->gpio_dir |= ALC233_STARFIGHTER_GPIO2;

		spec->gpio_data &= ~ALC233_STARFIGHTER_GPIO2;

		break;

	case HDA_FIXUP_ACT_PROBE:

		spec->gen.pcm_playback_hook = alc233_starfighter_pcm_hook;

		break;

	}

}



static void alc269_fixup_pincfg_no_hp_to_lineout(struct hda_codec *codec,