Skip to content

Commit

Permalink
ALSA: hda - Fix volume-init of ALC299 & co
Browse files Browse the repository at this point in the history
ALC269 and compatible codecs have the output volume in DACs, thus we
can't use the ALC880's code as is.  Fixed by checking the amp caps and
picking up the right widget for initialization.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
  • Loading branch information
Takashi Iwai committed Jun 27, 2011
1 parent 39fa84e commit 050ea75
Showing 1 changed file with 20 additions and 9 deletions.
29 changes: 20 additions & 9 deletions sound/pci/hda/patch_realtek.c
Original file line number Diff line number Diff line change
Expand Up @@ -5605,17 +5605,28 @@ static int get_pin_type(int line_out_type)
return PIN_OUT;
}

static void alc880_auto_init_dac(struct hda_codec *codec, hda_nid_t nid)
static void alc880_auto_init_dac(struct hda_codec *codec, hda_nid_t dac)
{
if (!nid)
hda_nid_t nid, mix;

if (!dac)
return;
nid = alc880_idx_to_mixer(alc880_dac_to_idx(nid));
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_OUT_ZERO);
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_IN_UNMUTE(0));
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_IN_UNMUTE(1));
mix = alc880_idx_to_mixer(alc880_dac_to_idx(dac));
if (query_amp_caps(codec, dac, HDA_OUTPUT) & AC_AMPCAP_NUM_STEPS)
nid = dac;
else if (query_amp_caps(codec, mix, HDA_OUTPUT) & AC_AMPCAP_NUM_STEPS)
nid = mix;
else
nid = 0;
if (nid)
snd_hda_codec_write(codec, nid, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_OUT_ZERO);
if (query_amp_caps(codec, mix, HDA_INPUT) & AC_AMPCAP_MUTE) {
snd_hda_codec_write(codec, mix, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_IN_UNMUTE(0));
snd_hda_codec_write(codec, mix, 0, AC_VERB_SET_AMP_GAIN_MUTE,
AMP_IN_UNMUTE(1));
}
}

static void alc880_auto_init_multi_out(struct hda_codec *codec)
Expand Down

0 comments on commit 050ea75

Please sign in to comment.