|
@@ -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));
|