]> err.no Git - linux-2.6/commitdiff
[ALSA] hda-codec - Fix noisy output wtih AD1986A 3stack model
authorTakashi Iwai <tiwai@suse.de>
Mon, 27 Mar 2006 10:52:22 +0000 (12:52 +0200)
committerJaroslav Kysela <perex@suse.cz>
Fri, 31 Mar 2006 15:58:57 +0000 (17:58 +0200)
Fixed the noisy output wtih AD1986A 3stack model using 2 channels.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_analog.c

index 32401bd8c22940838be7a2a9dd839d04eda0347d..2bfe37e8543cd75fad840821505fb57f2fd11498 100644 (file)
@@ -44,6 +44,7 @@ struct ad198x_spec {
                                         * dig_out_nid and hp_nid are optional
                                         */
        unsigned int cur_eapd;
+       unsigned int need_dac_fix;
 
        /* capture */
        unsigned int num_adc_nids;
@@ -836,10 +837,14 @@ static int patch_ad1986a(struct hda_codec *codec)
        case AD1986A_3STACK:
                spec->num_mixers = 2;
                spec->mixers[1] = ad1986a_3st_mixers;
-               spec->num_init_verbs = 2;
+               spec->num_init_verbs = 3;
                spec->init_verbs[1] = ad1986a_3st_init_verbs;
+               spec->init_verbs[2] = ad1986a_ch2_init;
                spec->channel_mode = ad1986a_modes;
                spec->num_channel_mode = ARRAY_SIZE(ad1986a_modes);
+               spec->need_dac_fix = 1;
+               spec->multiout.max_channels = 2;
+               spec->multiout.num_dacs = 1;
                break;
        case AD1986A_LAPTOP:
                spec->mixers[0] = ad1986a_laptop_mixers;
@@ -1555,6 +1560,8 @@ static int ad198x_ch_mode_put(struct snd_kcontrol *kcontrol,
 {
        struct hda_codec *codec = snd_kcontrol_chip(kcontrol);
        struct ad198x_spec *spec = codec->spec;
+       if (spec->need_dac_fix)
+               spec->multiout.num_dacs = spec->multiout.max_channels / 2;
        return snd_hda_ch_mode_put(codec, ucontrol, spec->channel_mode,
                                   spec->num_channel_mode, &spec->multiout.max_channels);
 }