Commit f82d7d16 authored by Mengdong Lin's avatar Mengdong Lin Committed by Takashi Iwai

ALSA : hda - not use assigned converters for all unused pins

BIOS can mark a pin as "no physical connection" if the port is used by an
integrated display which is not audio capable. And audio driver will overlook
such pins.

On Haswell, such a disconneted pin will keep muted and connected to the 1st
converter by default. But if the 1st convertor is assigned to a connected pin
for audio streaming. The muted disconnected pin can make the connected pin
no sound output.

So this patch avoids using assigned converters for all unused pins for Haswell,
including the disconected pins.
Signed-off-by: default avatarMengdong Lin <mengdong.lin@intel.com>
Reviewed-by: default avatarDavid Henningsson <david.henningsson@canonical.com>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent b26d19e4
...@@ -1149,32 +1149,43 @@ static int hdmi_choose_cvt(struct hda_codec *codec, ...@@ -1149,32 +1149,43 @@ static int hdmi_choose_cvt(struct hda_codec *codec,
} }
static void haswell_config_cvts(struct hda_codec *codec, static void haswell_config_cvts(struct hda_codec *codec,
int pin_id, int mux_id) hda_nid_t pin_nid, int mux_idx)
{ {
struct hdmi_spec *spec = codec->spec; struct hdmi_spec *spec = codec->spec;
struct hdmi_spec_per_pin *per_pin; hda_nid_t nid, end_nid;
int pin_idx, mux_idx; int cvt_idx, curr;
int curr; struct hdmi_spec_per_cvt *per_cvt;
int err;
for (pin_idx = 0; pin_idx < spec->num_pins; pin_idx++) { /* configure all pins, including "no physical connection" ones */
per_pin = get_pin(spec, pin_idx); end_nid = codec->start_nid + codec->num_nodes;
for (nid = codec->start_nid; nid < end_nid; nid++) {
unsigned int wid_caps = get_wcaps(codec, nid);
unsigned int wid_type = get_wcaps_type(wid_caps);
if (pin_idx == pin_id) if (wid_type != AC_WID_PIN)
continue; continue;
curr = snd_hda_codec_read(codec, per_pin->pin_nid, 0, if (nid == pin_nid)
continue;
curr = snd_hda_codec_read(codec, nid, 0,
AC_VERB_GET_CONNECT_SEL, 0); AC_VERB_GET_CONNECT_SEL, 0);
if (curr != mux_idx)
continue;
/* Choose another unused converter */ /* choose an unassigned converter. The conveters in the
if (curr == mux_id) { * connection list are in the same order as in the codec.
err = hdmi_choose_cvt(codec, pin_idx, NULL, &mux_idx); */
if (err < 0) for (cvt_idx = 0; cvt_idx < spec->num_cvts; cvt_idx++) {
return; per_cvt = get_cvt(spec, cvt_idx);
snd_printdd("HDMI: choose converter %d for pin %d\n", mux_idx, pin_idx); if (!per_cvt->assigned) {
snd_hda_codec_write_cache(codec, per_pin->pin_nid, 0, snd_printdd("choose cvt %d for pin nid %d\n",
cvt_idx, nid);
snd_hda_codec_write_cache(codec, nid, 0,
AC_VERB_SET_CONNECT_SEL, AC_VERB_SET_CONNECT_SEL,
mux_idx); cvt_idx);
break;
}
} }
} }
} }
...@@ -1216,7 +1227,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo, ...@@ -1216,7 +1227,7 @@ static int hdmi_pcm_open(struct hda_pcm_stream *hinfo,
/* configure unused pins to choose other converters */ /* configure unused pins to choose other converters */
if (is_haswell(codec)) if (is_haswell(codec))
haswell_config_cvts(codec, pin_idx, mux_idx); haswell_config_cvts(codec, per_pin->pin_nid, mux_idx);
snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid); snd_hda_spdif_ctls_assign(codec, pin_idx, per_cvt->cvt_nid);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment