lkml.org 
[lkml]   [2019]   [Nov]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.19 167/209] ALSA: hda/ca0132 - Fix input effect controls for desktop cards
    Date
    From: Connor McAdams <conmanx360@gmail.com>

    [ Upstream commit 7a2dc84fc480aec4f8f96e152327423014edf668 ]

    This patch removes the echo cancellation control for desktop cards, and
    makes use of the special 0x47 SCP command for noise reduction.

    Signed-off-by: Connor McAdams <conmanx360@gmail.com>
    Reviewed-by: Takashi Sakamoto <o-takashi@sakamocchi.jp>
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/pci/hda/patch_ca0132.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    diff --git a/sound/pci/hda/patch_ca0132.c b/sound/pci/hda/patch_ca0132.c
    index 0436789e7cd88..36cf23a300d46 100644
    --- a/sound/pci/hda/patch_ca0132.c
    +++ b/sound/pci/hda/patch_ca0132.c
    @@ -4520,7 +4520,7 @@ static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val)
    val = 0;

    /* If Voice Focus on SBZ, set to two channel. */
    - if ((nid == VOICE_FOCUS) && (spec->quirk == QUIRK_SBZ)
    + if ((nid == VOICE_FOCUS) && (spec->use_pci_mmio)
    && (spec->cur_mic_type != REAR_LINE_IN)) {
    if (spec->effects_switch[CRYSTAL_VOICE -
    EFFECT_START_NID]) {
    @@ -4539,7 +4539,7 @@ static int ca0132_effects_set(struct hda_codec *codec, hda_nid_t nid, long val)
    * For SBZ noise reduction, there's an extra command
    * to module ID 0x47. No clue why.
    */
    - if ((nid == NOISE_REDUCTION) && (spec->quirk == QUIRK_SBZ)
    + if ((nid == NOISE_REDUCTION) && (spec->use_pci_mmio)
    && (spec->cur_mic_type != REAR_LINE_IN)) {
    if (spec->effects_switch[CRYSTAL_VOICE -
    EFFECT_START_NID]) {
    @@ -5855,8 +5855,8 @@ static int ca0132_build_controls(struct hda_codec *codec)
    */
    num_fx = OUT_EFFECTS_COUNT + IN_EFFECTS_COUNT;
    for (i = 0; i < num_fx; i++) {
    - /* SBZ and R3D break if Echo Cancellation is used. */
    - if (spec->quirk == QUIRK_SBZ || spec->quirk == QUIRK_R3D) {
    + /* Desktop cards break if Echo Cancellation is used. */
    + if (spec->use_pci_mmio) {
    if (i == (ECHO_CANCELLATION - IN_EFFECT_START_NID +
    OUT_EFFECTS_COUNT))
    continue;
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-11-13 02:55    [W:4.240 / U:0.284 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site