lkml.org 
[lkml]   [2011]   [Mar]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[55/87] ALSA: hda - Initialize special cases for input src in init phase
    2.6.37-stable review patch.  If anyone has any objections, please let us know.

    ------------------

    From: Takashi Iwai <tiwai@suse.de>

    commit 584c0c4c359bdac37d94157f8d7fc513d26c8328 upstream.

    Currently some special handling for the unusual case like dual-ADCs
    or a single-input-src is done in the tree-parse time in
    set_capture_mixer(). But this setup could be overwritten by static
    init verbs.

    This patch moves the initialization into the init phase so that
    such input-src setup won't be lost.

    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    sound/pci/hda/patch_realtek.c | 19 ++++++++++++++++---
    1 file changed, 16 insertions(+), 3 deletions(-)

    --- a/sound/pci/hda/patch_realtek.c
    +++ b/sound/pci/hda/patch_realtek.c
    @@ -393,6 +393,7 @@ struct alc_spec {
    /* other flags */
    unsigned int no_analog :1; /* digital I/O only */
    unsigned int dual_adc_switch:1; /* switch ADCs (for ALC275) */
    + unsigned int single_input_src:1;
    int init_amp;
    int codec_variant; /* flag for other variants */

    @@ -3798,6 +3799,8 @@ static struct hda_amp_list alc880_lg_loo
    * Common callbacks
    */

    +static void alc_init_special_input_src(struct hda_codec *codec);
    +
    static int alc_init(struct hda_codec *codec)
    {
    struct alc_spec *spec = codec->spec;
    @@ -3808,6 +3811,7 @@ static int alc_init(struct hda_codec *co

    for (i = 0; i < spec->num_init_verbs; i++)
    snd_hda_sequence_write(codec, spec->init_verbs[i]);
    + alc_init_special_input_src(codec);

    if (spec->init_hook)
    spec->init_hook(codec);
    @@ -5441,6 +5445,7 @@ static void fixup_single_adc(struct hda_
    spec->capsrc_nids += i;
    spec->adc_nids += i;
    spec->num_adc_nids = 1;
    + spec->single_input_src = 1;
    }
    }

    @@ -5452,6 +5457,16 @@ static void fixup_dual_adc_switch(struct
    init_capsrc_for_pin(codec, spec->int_mic.pin);
    }

    +/* initialize some special cases for input sources */
    +static void alc_init_special_input_src(struct hda_codec *codec)
    +{
    + struct alc_spec *spec = codec->spec;
    + if (spec->dual_adc_switch)
    + fixup_dual_adc_switch(codec);
    + else if (spec->single_input_src)
    + init_capsrc_for_pin(codec, spec->autocfg.inputs[0].pin);
    +}
    +
    static void set_capture_mixer(struct hda_codec *codec)
    {
    struct alc_spec *spec = codec->spec;
    @@ -5467,7 +5482,7 @@ static void set_capture_mixer(struct hda
    int mux = 0;
    int num_adcs = spec->num_adc_nids;
    if (spec->dual_adc_switch)
    - fixup_dual_adc_switch(codec);
    + num_adcs = 1;
    else if (spec->auto_mic)
    fixup_automic_adc(codec);
    else if (spec->input_mux) {
    @@ -5476,8 +5491,6 @@ static void set_capture_mixer(struct hda
    else if (spec->input_mux->num_items == 1)
    fixup_single_adc(codec);
    }
    - if (spec->dual_adc_switch)
    - num_adcs = 1;
    spec->cap_mixer = caps[mux][num_adcs - 1];
    }
    }



    \
     
     \ /
      Last update: 2011-03-22 00:45    [W:0.022 / U:0.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site