From 77ce2fcbca1d082e9dd877bd8c9a9b2ca3181906 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 15 Jun 2012 12:45:43 +0200
Subject: [PATCH] --- yaml --- r: 316127 b: refs/heads/master c:
 4f0110ced1b5d61e6df4871f6f800a9d3678bf26 h: refs/heads/master i:   316125:
 5a75fc0d664e2a9f86146f93c354fd87f0d93653   316123:
 a101416bf14c988ba670afd30395a27ebbb8fde8   316119:
 dd8565041fbaae12cd6e0d00aeeb9d5f171548eb   316111:
 ff8ca539b36466e35d6fee6426045bba3d48ece1   316095:
 8e67cba1ca9c83ba04363912ae27c47ac0fe0ab8 v: v3

---
 [refs]                           |  2 +-
 trunk/sound/pci/hda/patch_hdmi.c | 56 +++++++++++++-------------------
 2 files changed, 23 insertions(+), 35 deletions(-)

diff --git a/[refs] b/[refs]
index 0fff87ca9d39..9665bf158d79 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4b6ace9e7176d93f819cec9df47faadaaceead4b
+refs/heads/master: 4f0110ced1b5d61e6df4871f6f800a9d3678bf26
diff --git a/trunk/sound/pci/hda/patch_hdmi.c b/trunk/sound/pci/hda/patch_hdmi.c
index 8e7333b07b58..c9d0c98bbe86 100644
--- a/trunk/sound/pci/hda/patch_hdmi.c
+++ b/trunk/sound/pci/hda/patch_hdmi.c
@@ -1412,6 +1412,24 @@ static int simple_playback_build_controls(struct hda_codec *codec)
 	return 0;
 }
 
+static int simple_playback_init(struct hda_codec *codec)
+{
+	struct hdmi_spec *spec = codec->spec;
+	int i;
+
+	for (i = 0; i < spec->num_pins; i++) {
+		snd_hda_codec_write(codec, spec->pins[i].pin_nid, 0,
+				    AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT);
+		/* some codecs require to unmute the pin */
+		if (get_wcaps(codec, spec->pins[i].pin_nid) & AC_WCAP_OUT_AMP)
+			snd_hda_codec_write(codec, spec->pins[i].pin_nid, 0,
+					    AC_VERB_SET_AMP_GAIN_MUTE,
+					    AMP_OUT_UNMUTE);
+	}
+	snd_hda_jack_report_sync(codec);
+	return 0;
+}
+
 static void simple_playback_free(struct hda_codec *codec)
 {
 	struct hdmi_spec *spec = codec->spec;
@@ -1831,29 +1849,10 @@ static const struct hda_pcm_stream atihdmi_pcm_digital_playback = {
 	},
 };
 
-static const struct hda_verb atihdmi_basic_init[] = {
-	/* enable digital output on pin widget */
-	{ 0x03, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-	{} /* terminator */
-};
-
-static int atihdmi_init(struct hda_codec *codec)
-{
-	struct hdmi_spec *spec = codec->spec;
-
-	snd_hda_sequence_write(codec, atihdmi_basic_init);
-	/* SI codec requires to unmute the pin */
-	if (get_wcaps(codec, spec->pins[0].pin_nid) & AC_WCAP_OUT_AMP)
-		snd_hda_codec_write(codec, spec->pins[0].pin_nid, 0,
-				    AC_VERB_SET_AMP_GAIN_MUTE,
-				    AMP_OUT_UNMUTE);
-	return 0;
-}
-
 static const struct hda_codec_ops atihdmi_patch_ops = {
 	.build_controls = simple_playback_build_controls,
 	.build_pcms = simple_playback_build_pcms,
-	.init = atihdmi_init,
+	.init = simple_playback_init,
 	.free = simple_playback_free,
 };
 
@@ -1872,6 +1871,7 @@ static int patch_atihdmi(struct hda_codec *codec)
 	spec->multiout.max_channels = 2;
 	spec->multiout.dig_out_nid = ATIHDMI_CVT_NID;
 	spec->num_cvts = 1;
+	spec->num_pins = 1;
 	spec->cvts[0].cvt_nid = ATIHDMI_CVT_NID;
 	spec->pins[0].pin_nid = ATIHDMI_PIN_NID;
 	spec->pcm_playback = &atihdmi_pcm_digital_playback;
@@ -1885,23 +1885,10 @@ static int patch_atihdmi(struct hda_codec *codec)
 #define VIAHDMI_CVT_NID	0x02	/* audio converter1 */
 #define VIAHDMI_PIN_NID	0x03	/* HDMI output pin1 */
 
-static struct hda_verb viahdmi_basic_init[] = {
-	/* enable digital output on pin widget */
-	{ VIAHDMI_PIN_NID, AC_VERB_SET_PIN_WIDGET_CONTROL, PIN_OUT },
-	{} /* terminator */
-};
-
-static int via_hdmi_init(struct hda_codec *codec)
-{
-	snd_hda_sequence_write(codec, viahdmi_basic_init);
-	snd_hda_jack_report_sync(codec);
-	return 0;
-}
-
 static const struct hda_codec_ops via_hdmi_patch_ops = {
 	.build_controls = simple_playback_build_controls,
 	.build_pcms = simple_playback_build_pcms,
-	.init = via_hdmi_init,
+	.init = simple_playback_init,
 	.free = simple_playback_free,
 	.unsol_event = simple_hdmi_unsol_event,
 };
@@ -1930,6 +1917,7 @@ static int patch_via_hdmi(struct hda_codec *codec)
 	spec->multiout.max_channels = 2;
 	spec->multiout.dig_out_nid = VIAHDMI_CVT_NID; /* pure-digital case */
 	spec->num_cvts = 1;
+	spec->num_pins = 1;
 	spec->cvts[0].cvt_nid = VIAHDMI_CVT_NID;
 	spec->pins[0].pin_nid = VIAHDMI_PIN_NID;
 	spec->pcm_playback = &via_hdmi_digital_playback;