| From 6169b673618bf0b2518ce413b54925782a603f06 Mon Sep 17 00:00:00 2001 |
| From: Takashi Iwai <tiwai@suse.de> |
| Date: Fri, 14 Dec 2012 10:22:35 +0100 |
| Subject: ALSA: hda - Always turn on pins for HDMI/DP |
| |
| From: Takashi Iwai <tiwai@suse.de> |
| |
| commit 6169b673618bf0b2518ce413b54925782a603f06 upstream. |
| |
| We've seen the broken HDMI *video* output on some machines with GM965, |
| and the debugging session pointed that the culprit is the disabled |
| audio output pins. Toggling these pins dynamically on demand caused |
| flickering of HDMI TV. |
| |
| This patch changes the behavior to keep the pin ON constantly. |
| |
| Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=51421 |
| |
| Signed-off-by: Takashi Iwai <tiwai@suse.de> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| sound/pci/hda/patch_hdmi.c | 18 ++++-------------- |
| 1 file changed, 4 insertions(+), 14 deletions(-) |
| |
| --- a/sound/pci/hda/patch_hdmi.c |
| +++ b/sound/pci/hda/patch_hdmi.c |
| @@ -431,9 +431,11 @@ static void hdmi_init_pin(struct hda_cod |
| if (get_wcaps(codec, pin_nid) & AC_WCAP_OUT_AMP) |
| snd_hda_codec_write(codec, pin_nid, 0, |
| AC_VERB_SET_AMP_GAIN_MUTE, AMP_OUT_UNMUTE); |
| - /* Disable pin out until stream is active*/ |
| + /* Enable pin out: some machines with GM965 gets broken output when |
| + * the pin is disabled or changed while using with HDMI |
| + */ |
| snd_hda_codec_write(codec, pin_nid, 0, |
| - AC_VERB_SET_PIN_WIDGET_CONTROL, 0); |
| + AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT); |
| } |
| |
| static int hdmi_get_channel_count(struct hda_codec *codec, hda_nid_t cvt_nid) |
| @@ -1338,7 +1340,6 @@ static int generic_hdmi_playback_pcm_pre |
| 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; |
| bool non_pcm; |
| |
| non_pcm = check_non_pcm_per_cvt(codec, cvt_nid); |
| @@ -1347,11 +1348,6 @@ static int generic_hdmi_playback_pcm_pre |
| |
| hdmi_setup_audio_infoframe(codec, pin_idx, non_pcm, 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); |
| } |
| |
| @@ -1371,7 +1367,6 @@ static int hdmi_pcm_close(struct hda_pcm |
| int cvt_idx, pin_idx; |
| struct hdmi_spec_per_cvt *per_cvt; |
| struct hdmi_spec_per_pin *per_pin; |
| - int pinctl; |
| |
| if (hinfo->nid) { |
| cvt_idx = cvt_nid_to_cvt_index(spec, hinfo->nid); |
| @@ -1388,11 +1383,6 @@ static int hdmi_pcm_close(struct hda_pcm |
| return -EINVAL; |
| per_pin = &spec->pins[pin_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_unassign(codec, pin_idx); |
| per_pin->chmap_set = false; |
| memset(per_pin->chmap, 0, sizeof(per_pin->chmap)); |