Attachment 71493 Details for Bug 55556 – Patch to set HDMI audio pins on constantly

[patch] Patch to set HDMI audio pins on constantly

0001-ALSA-hda-Always-turn-on-pins-for-HDMI-DP.patch (text/plain), 3.00 KB, created by Takashi Iwai on 2012-12-14 09:29:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2012-12-14 09:29:59 UTC

Size: 3.00 KB

patch

obsolete

>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: [PATCH] ALSA: hda - Always turn on pins for HDMI/DP
>
>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
>
>Cc: <stable@vger.kernel.org>
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>---
> sound/pci/hda/patch_hdmi.c | 18 ++++--------------
> 1 file changed, 4 insertions(+), 14 deletions(-)
>
>diff --git a/sound/pci/hda/patch_hdmi.c b/sound/pci/hda/patch_hdmi.c
>index 0fcfa6f..37dd06d 100644
>--- 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_codec *codec, hda_nid_t pin_nid)
> 	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)
>@@ -1341,7 +1343,6 @@ 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;
> 	bool non_pcm;
> 
> 	non_pcm = check_non_pcm_per_cvt(codec, cvt_nid);
>@@ -1350,11 +1351,6 @@ static int generic_hdmi_playback_pcm_prepare(struct hda_pcm_stream *hinfo,
> 
> 	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);
> }
> 
>@@ -1374,7 +1370,6 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
> 	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);
>@@ -1391,11 +1386,6 @@ static int hdmi_pcm_close(struct hda_pcm_stream *hinfo,
> 			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));
>-- 
>1.8.0.1
>

Actions: View | Splinter Review

Attachments on bug 55556: 68010 | 68012 | 68013 | 68014 | 68067 | 68467 | 68468 | 68767 | 71493

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.