lkml.org 
[lkml]   [2012]   [Apr]   [11]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[ 08/78] ALSA: hda/realtek - Fix ADC assignment with a shared HP/Mic pin
    3.3-stable review patch.  If anyone has any objections, please let me know.

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

    From: Takashi Iwai <tiwai@suse.de>

    commit 26acaf08556a3c64ebf8ea3654b51e6acbb0a26c upstream.

    The recent Realtek driver tries to assign an extra input via the
    headphone plug when only a single input source is found. The code
    worked on Samsung Q1, but it broke ASUS 1015 where the mic is a
    digital-mic and only a specific ADC works.

    This patch fixes the assignment of ADC in the shared mic/hp case.
    Instead of assuming the single ADC at first, reduce the ADCs after
    trying to assign both mic and HP pins.

    Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=42973

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

    ---
    sound/pci/hda/patch_realtek.c | 11 +++++++----
    1 file changed, 7 insertions(+), 4 deletions(-)

    --- a/sound/pci/hda/patch_realtek.c
    +++ b/sound/pci/hda/patch_realtek.c
    @@ -2709,9 +2709,6 @@ static int alc_auto_fill_adc_caps(struct
    int max_nums = ARRAY_SIZE(spec->private_adc_nids);
    int i, nums = 0;

    - if (spec->shared_mic_hp)
    - max_nums = 1; /* no multi streams with the shared HP/mic */
    -
    nid = codec->start_nid;
    for (i = 0; i < codec->num_nodes; i++, nid++) {
    hda_nid_t src;
    @@ -3723,6 +3720,7 @@ static void alc_remove_invalid_adc_nids(
    if (spec->dyn_adc_switch)
    return;

    + again:
    nums = 0;
    for (n = 0; n < spec->num_adc_nids; n++) {
    hda_nid_t cap = spec->private_capsrc_nids[n];
    @@ -3743,6 +3741,11 @@ static void alc_remove_invalid_adc_nids(
    if (!nums) {
    /* check whether ADC-switch is possible */
    if (!alc_check_dyn_adc_switch(codec)) {
    + if (spec->shared_mic_hp) {
    + spec->shared_mic_hp = 0;
    + spec->private_imux[0].num_items = 1;
    + goto again;
    + }
    printk(KERN_WARNING "hda_codec: %s: no valid ADC found;"
    " using fallback 0x%x\n",
    codec->chip_name, spec->private_adc_nids[0]);
    @@ -3760,7 +3763,7 @@ static void alc_remove_invalid_adc_nids(

    if (spec->auto_mic)
    alc_auto_mic_check_imux(codec); /* check auto-mic setups */
    - else if (spec->input_mux->num_items == 1)
    + else if (spec->input_mux->num_items == 1 || spec->shared_mic_hp)
    spec->num_adc_nids = 1; /* reduce to a single ADC */
    }




    \
     
     \ /
      Last update: 2012-04-12 02:11    [W:0.021 / U:1.308 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site