Skip to content

Commit

Permalink
ALSA: hda - Fix volume-init for ALC259 with invalid widget caps
Browse files Browse the repository at this point in the history
ALC259 seems to provide an invalid widget capability for the input-src
selector widget.  The widget shows the input-amp while it's a selector,
and this confuses the current ALC882 initialization code that is used
for ALC259, too.  For fixing this, check the amp capability and handle
the connection selection individually.

Also, ALC259 has no mute bit in DAC volume, so we need to initialize
it as ZERO instead of MUTE.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jun 27, 2011
1 parent 050ea75 commit 7ec9c6c
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -11075,6 +11075,7 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
unsigned int mux_idx;
const struct hda_input_mux *imux;
int conns, mute, idx, item;
unsigned int wid_type;

/* mute ADC */
snd_hda_codec_write(codec, spec->adc_nids[c], 0,
Expand All @@ -11088,6 +11089,7 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
imux = &spec->input_mux[mux_idx];
if (!imux->num_items && mux_idx > 0)
imux = &spec->input_mux[0];
wid_type = get_wcaps_type(get_wcaps(codec, nid));
for (idx = 0; idx < conns; idx++) {
/* if the current connection is the selected one,
* unmute it as default - otherwise mute it
Expand All @@ -11100,17 +11102,13 @@ static void alc882_auto_init_input_src(struct hda_codec *codec)
break;
}
}
/* check if we have a selector or mixer
* we could check for the widget type instead, but
* just check for Amp-In presence (in case of mixer
* without amp-in there is something wrong, this
* function shouldn't be used or capsrc nid is wrong)
*/
if (get_wcaps(codec, nid) & AC_WCAP_IN_AMP)
/* initialize the mute status if mute-amp is present */
if (query_amp_caps(codec, nid, HDA_INPUT) & AC_AMPCAP_MUTE)
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_AMP_GAIN_MUTE,
mute);
else if (mute != AMP_IN_MUTE(idx))
if (wid_type == AC_WID_AUD_SEL &&
mute != AMP_IN_MUTE(idx))
snd_hda_codec_write(codec, nid, 0,
AC_VERB_SET_CONNECT_SEL,
idx);
Expand Down Expand Up @@ -13594,7 +13592,7 @@ static void alc268_auto_init_dac(struct hda_codec *codec, hda_nid_t nid)
if (!nid)
return;
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_OUT_MUTE);
AMP_OUT_ZERO);
}

static void alc268_auto_init_multi_out(struct hda_codec *codec)
Expand Down

0 comments on commit 7ec9c6c

Please sign in to comment.