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

Commit 9e76e6d0 authored by Dylan Reid's avatar Dylan Reid Committed by Takashi Iwai
Browse files

ALSA: hda - Turn on PIN_OUT from hdmi playback prepare. 



Turn on the pin widget's PIN_OUT bit from playback prepare. The pin is
enabled in open, but is disabled in hdmi_init_pin which is called during
system resume.  This causes a system suspend/resume during playback to
mute HDMI/DP. Enabling the pin in prepare instead of open allows calling
snd_pcm_prepare after a system resume to restore audio.

Signed-off-by: default avatarDylan Reid <dgreid@chromium.org>
Cc: <stable@vger.kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 1558eb83

sound/pci/hda/patch_hdmi.c

+6 −6
Original line number Diff line number Diff line
@@ -876,7 +876,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, 
	struct hdmi_spec_per_pin *per_pin;

	struct hdmi_eld *eld;

	struct hdmi_spec_per_cvt *per_cvt = NULL;

	int pinctl;



	/* Validate hinfo */

	pin_idx = hinfo_to_pin_index(spec, hinfo);
@@ -912,11 +911,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, 
	snd_hda_codec_write(codec, per_pin->pin_nid, 0,

			    AC_VERB_SET_CONNECT_SEL,

			    mux_idx);

	pinctl = snd_hda_codec_read(codec, per_pin->pin_nid, 0,

				    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);

	snd_hda_codec_write(codec, per_pin->pin_nid, 0,

			    AC_VERB_SET_PIN_WIDGET_CONTROL,

			    pinctl | PIN_OUT);

	snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid);



	/* Initially set the converter's capabilities */
@@ -1153,11 +1147,17 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo, 
	struct hdmi_spec *spec = codec->spec;

	int pin_idx = hinfo_to_pin_index(spec, hinfo);

	hda_nid_t pin_nid = spec->pins[pin_idx].pin_nid;

	int pinctl;



	hdmi_set_channel_count(codec, cvt_nid, substream->runtime->channels);



	hdmi_setup_audio_infoframe(codec, pin_idx, substream);



	pinctl = snd_hda_codec_read(codec, pin_nid, 0,

				    AC_VERB_GET_PIN_WIDGET_CONTROL, 0);

	snd_hda_codec_write(codec, pin_nid, 0,

			    AC_VERB_SET_PIN_WIDGET_CONTROL, pinctl | PIN_OUT);



	return hdmi_setup_stream(codec, cvt_nid, pin_nid, stream_tag, format);

}