[alsa-devel] [PATCH v3] ALSA: hda - Turn on PIN_OUT from hdmi playback prepare.

[Takashi Iwai]

At Thu, 19 Jul 2012 17:52:58 -0700,
Dylan Reid wrote:
> 
> 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: Dylan Reid <dgreid at chromium.org>

Applied now with Cc to stable kernel.
Thanks.


Takashi

> ---
>  sound/pci/hda/patch_hdmi.c | 12 ++++++------
>  1 file changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
> index 0b4a1ea..641408d 100644
> --- a/sound/pci/hda/patch_hdmi.c
> +++ b/sound/pci/hda/patch_hdmi.c
> @@ -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);
>  }
>  
> -- 
> 1.7.11.2.138.g2b53359
>