From: Takashi Iwai Subject: Re: [PATCH v2] ALSA: hda - Turn on PIN_OUT from hdmi playback prepare. Date: Thu, 19 Jul 2012 11:51:53 +0200 Message-ID: References: <1342690974-27682-1-git-send-email-dgreid@chromium.org> Mime-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mx2.suse.de (cantor2.suse.de [195.135.220.15]) by alsa0.perex.cz (Postfix) with ESMTP id 24EA0265299 for ; Thu, 19 Jul 2012 11:51:51 +0200 (CEST) In-Reply-To: <1342690974-27682-1-git-send-email-dgreid@chromium.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org To: Dylan Reid Cc: alsa-devel@alsa-project.org, swarren@nvidia.com List-Id: alsa-devel@alsa-project.org At Thu, 19 Jul 2012 02:42:54 -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 > --- > sound/pci/hda/patch_hdmi.c | 9 ++++++--- > 1 file changed, 6 insertions(+), 3 deletions(-) > > diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c > index 0b4a1ea..764b975 100644 > --- a/sound/pci/hda/patch_hdmi.c > +++ b/sound/pci/hda/patch_hdmi.c > @@ -914,9 +914,6 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, > mux_idx); > pinctl = snd_hda_codec_read(codec, per_pin->pin_nid, 0, > AC_VERB_GET_PIN_WIDGET_CONTROL, 0); Do we still need to keep this line (and pinctl variable) in this function? thanks, Takashi > - 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 +1150,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 >