From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 66096C2D0C6 for ; Fri, 27 Dec 2019 08:37:36 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 29472206F4 for ; Fri, 27 Dec 2019 08:37:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726343AbfL0IS7 (ORCPT ); Fri, 27 Dec 2019 03:18:59 -0500 Received: from mx2.suse.de ([195.135.220.15]:34178 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbfL0IS6 (ORCPT ); Fri, 27 Dec 2019 03:18:58 -0500 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 03A04AC22; Fri, 27 Dec 2019 08:18:54 +0000 (UTC) Date: Fri, 27 Dec 2019 09:18:53 +0100 Message-ID: From: Takashi Iwai To: Kailang Cc: Chris Chiu , "perex@perex.cz" , "tiwai@suse.com" , "hui.wang@canonical.com" , "tomas.espeleta@gmail.com" , "alsa-devel@alsa-project.org" , "linux-kernel@vger.kernel.org" , "linux@endlessm.com" , Jian-Hong Pan Subject: Re: [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC In-Reply-To: <9a6937eb53264ef99409ac234fffe8af@realtek.com> References: <20191227065724.2581-1-chris.chiu@pacidal.com> <9a6937eb53264ef99409ac234fffe8af@realtek.com> User-Agent: Wanderlust/2.15.9 (Almost Unreal) SEMI/1.14.6 (Maruoka) FLIM/1.14.9 (=?UTF-8?B?R29qxY0=?=) APEL/10.8 Emacs/25.3 (x86_64-suse-linux-gnu) MULE/6.0 (HANACHIRUSATO) MIME-Version: 1.0 (generated by SEMI 1.14.6 - "Maruoka") Content-Type: text/plain; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 27 Dec 2019 08:28:32 +0100, Kailang wrote: > > Hi all, > > Current kernel had exist function alc285_fixup_speaker2_to_dac1 to fixed dac for 0x17. > Replace as below. Good catch. Chris, could you rebase on the top of the current for-linus branch, modify as Kailang suggested and resubmit? Also, the commit id mentioned in your patch doesn't exist. Please correct to the right id. thanks, Takashi > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index fada1ff61353..0193a8722be2 100644 > --- a/sound/pci/hda/patch_realtek.c > +++ b/sound/pci/hda/patch_realtek.c > @@ -5950,7 +5960,8 @@ enum { > ALC269VC_FIXUP_ACER_HEADSET_MIC, > ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC, > ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, > - ALC294_FIXUP_ASUS_INTSPK_GPIO, > + ALC294_FIXUP_ASUS_DUAL_SPEAKERS, > + ALC294_FIXUP_FIXED_DAC_SUBWOOFER, > }; > > static const struct hda_fixup alc269_fixups[] = { @@ -7097,10 +7108,9 @@ static const struct hda_fixup alc269_fixups[] = { > { } > } > }, > - [ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC] = { > + [ALC294_FIXUP_ASUS_HEADSET_MIC] = { > .type = HDA_FIXUP_PINS, > .v.pins = (const struct hda_pintbl[]) { > - { 0x14, 0x411111f0 }, /* disable confusing internal speaker */ > { 0x19, 0x04a11150 }, /* use as headset mic, without its own jack detect */ > { } > }, > @@ -7117,12 +7127,18 @@ static const struct hda_fixup alc269_fixups[] = { > .chained = true, > .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE > }, > - [ALC294_FIXUP_ASUS_INTSPK_GPIO] = { > + [ALC294_FIXUP_FIXED_DAC_SUBWOOFER] = { > + .type = HDA_FIXUP_FUNC, > + .v.func = alc285_fixup_speaker2_to_dac1, > + .chained = true, > + .chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC > + }, > + [ALC294_FIXUP_ASUS_DUAL_SPEAKERS] = { > .type = HDA_FIXUP_FUNC, > /* The GPIO must be pulled to initialize the AMP */ > .v.func = alc_fixup_gpio4, > .chained = true, > - .chain_id = ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC > + .chain_id = ALC294_FIXUP_FIXED_DAC_SUBWOOFER > }, > }; > > @@ -7291,7 +7307,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] = { > SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", ALC269VB_FIXUP_ASUS_ZENBOOK), > SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), > SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", ALC269_FIXUP_STEREO_DMIC), > - SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", ALC294_FIXUP_ASUS_INTSPK_GPIO), > + SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", > +ALC294_FIXUP_ASUS_DUAL_SPEAKERS), > SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", ALC256_FIXUP_ASUS_HEADSET_MIC), > SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", ALC269_FIXUP_ASUS_G73JW), > SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", ALC256_FIXUP_ASUS_MIC), > -- > > > -----Original Message----- > > From: Chris Chiu > > Sent: Friday, December 27, 2019 2:57 PM > > To: perex@perex.cz; tiwai@suse.com; Kailang ; > > hui.wang@canonical.com; tomas.espeleta@gmail.com > > Cc: alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org; > > linux@endlessm.com; Chris Chiu ; Jian-Hong Pan > > > > Subject: [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC > > > > From: Chris Chiu > > > > ASUS reported that there's an additional speaker which serves as the > > subwoofer and uses DAC 0x02. It does not work with the commit > > 73a723348a43 ("ALSA: hda/realtek - Enable internal speaker of ASUS > > UX431FLC") which enables the amplifier and front speakers. This commit > > enables the subwoofer to improve the acoustic experience. > > > > Signed-off-by: Chris Chiu > > Signed-off-by: Jian-Hong Pan > > --- > > sound/pci/hda/patch_realtek.c | 28 ++++++++++++++++++++++------ > > 1 file changed, 22 insertions(+), 6 deletions(-) > > > > diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c > > index fada1ff61353..0193a8722be2 100644 > > --- a/sound/pci/hda/patch_realtek.c > > +++ b/sound/pci/hda/patch_realtek.c > > @@ -5576,6 +5576,16 @@ static void alc295_fixup_disable_dac3(struct > > hda_codec *codec, > > } > > } > > > > +/* Fixed DAC (0x02) on NID 0x17 to enable the mono speaker */ static > > +void alc294_fixup_fixed_dac_subwoofer(struct hda_codec *codec, > > + const struct hda_fixup *fix, int action) { > > + if (action == HDA_FIXUP_ACT_PRE_PROBE) { > > + hda_nid_t conn[1] = { 0x02 }; > > + snd_hda_override_conn_list(codec, 0x17, 1, conn); > > + } > > +} > > + > > /* Hook to update amp GPIO4 for automute */ static void > > alc280_hp_gpio4_automute_hook(struct hda_codec *codec, > > struct hda_jack_callback *jack) > > @@ -5950,7 +5960,8 @@ enum { > > ALC269VC_FIXUP_ACER_HEADSET_MIC, > > ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC, > > ALC256_FIXUP_MEDION_HEADSET_NO_PRESENCE, > > - ALC294_FIXUP_ASUS_INTSPK_GPIO, > > + ALC294_FIXUP_ASUS_DUAL_SPEAKERS, > > + ALC294_FIXUP_FIXED_DAC_SUBWOOFER, > > }; > > > > static const struct hda_fixup alc269_fixups[] = { @@ -7097,10 +7108,9 @@ > > static const struct hda_fixup alc269_fixups[] = { > > { } > > } > > }, > > - [ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC] = { > > + [ALC294_FIXUP_ASUS_HEADSET_MIC] = { > > .type = HDA_FIXUP_PINS, > > .v.pins = (const struct hda_pintbl[]) { > > - { 0x14, 0x411111f0 }, /* disable confusing internal speaker */ > > { 0x19, 0x04a11150 }, /* use as headset mic, without its own > > jack detect */ > > { } > > }, > > @@ -7117,12 +7127,18 @@ static const struct hda_fixup alc269_fixups[] = { > > .chained = true, > > .chain_id = ALC256_FIXUP_ASUS_HEADSET_MODE > > }, > > - [ALC294_FIXUP_ASUS_INTSPK_GPIO] = { > > + [ALC294_FIXUP_FIXED_DAC_SUBWOOFER] = { > > + .type = HDA_FIXUP_FUNC, > > + .v.func = alc294_fixup_fixed_dac_subwoofer, > > + .chained = true, > > + .chain_id = ALC294_FIXUP_ASUS_HEADSET_MIC > > + }, > > + [ALC294_FIXUP_ASUS_DUAL_SPEAKERS] = { > > .type = HDA_FIXUP_FUNC, > > /* The GPIO must be pulled to initialize the AMP */ > > .v.func = alc_fixup_gpio4, > > .chained = true, > > - .chain_id = ALC294_FIXUP_ASUS_INTSPK_HEADSET_MIC > > + .chain_id = ALC294_FIXUP_FIXED_DAC_SUBWOOFER > > }, > > }; > > > > @@ -7291,7 +7307,7 @@ static const struct snd_pci_quirk alc269_fixup_tbl[] > > = { > > SND_PCI_QUIRK(0x1043, 0x1427, "Asus Zenbook UX31E", > > ALC269VB_FIXUP_ASUS_ZENBOOK), > > SND_PCI_QUIRK(0x1043, 0x1517, "Asus Zenbook UX31A", > > ALC269VB_FIXUP_ASUS_ZENBOOK_UX31A), > > SND_PCI_QUIRK(0x1043, 0x16e3, "ASUS UX50", > > ALC269_FIXUP_STEREO_DMIC), > > - SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", > > ALC294_FIXUP_ASUS_INTSPK_GPIO), > > + SND_PCI_QUIRK(0x1043, 0x17d1, "ASUS UX431FL", > > +ALC294_FIXUP_ASUS_DUAL_SPEAKERS), > > SND_PCI_QUIRK(0x1043, 0x18b1, "Asus MJ401TA", > > ALC256_FIXUP_ASUS_HEADSET_MIC), > > SND_PCI_QUIRK(0x1043, 0x1a13, "Asus G73Jw", > > ALC269_FIXUP_ASUS_G73JW), > > SND_PCI_QUIRK(0x1043, 0x1a30, "ASUS X705UD", > > ALC256_FIXUP_ASUS_MIC), > > -- > > 2.20.1 >