From: Kailang <kailang@realtek.com>
To: Chris Chiu <chiu@endlessm.com>, "perex@perex.cz" <perex@perex.cz>,
"tiwai@suse.com" <tiwai@suse.com>,
"hui.wang@canonical.com" <hui.wang@canonical.com>,
"tomas.espeleta@gmail.com" <tomas.espeleta@gmail.com>
Cc: Jian-Hong Pan <jian-hong@endlessm.com>,
"alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
"linux@endlessm.com" <linux@endlessm.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>
Subject: Re: [alsa-devel] [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC
Date: Fri, 27 Dec 2019 07:28:32 +0000 [thread overview]
Message-ID: <9a6937eb53264ef99409ac234fffe8af@realtek.com> (raw)
In-Reply-To: <20191227065724.2581-1-chris.chiu@pacidal.com>
Hi all,
Current kernel had exist function alc285_fixup_speaker2_to_dac1 to fixed dac for 0x17.
Replace as below.
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 <chiu@endlessm.com>
> Sent: Friday, December 27, 2019 2:57 PM
> To: perex@perex.cz; tiwai@suse.com; Kailang <kailang@realtek.com>;
> hui.wang@canonical.com; tomas.espeleta@gmail.com
> Cc: alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org;
> linux@endlessm.com; Chris Chiu <chiu@endlessm.com>; Jian-Hong Pan
> <jian-hong@endlessm.com>
> Subject: [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC
>
> From: Chris Chiu <chiu@endlessm.com>
>
> 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 <chiu@endlessm.com>
> Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
> ---
> 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
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
WARNING: multiple messages have this Message-ID (diff)
From: Kailang <kailang@realtek.com>
To: Chris Chiu <chiu@endlessm.com>, "perex@perex.cz" <perex@perex.cz>,
"tiwai@suse.com" <tiwai@suse.com>,
"hui.wang@canonical.com" <hui.wang@canonical.com>,
"tomas.espeleta@gmail.com" <tomas.espeleta@gmail.com>
Cc: "alsa-devel@alsa-project.org" <alsa-devel@alsa-project.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux@endlessm.com" <linux@endlessm.com>,
Jian-Hong Pan <jian-hong@endlessm.com>
Subject: RE: [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC
Date: Fri, 27 Dec 2019 07:28:32 +0000 [thread overview]
Message-ID: <9a6937eb53264ef99409ac234fffe8af@realtek.com> (raw)
In-Reply-To: <20191227065724.2581-1-chris.chiu@pacidal.com>
Hi all,
Current kernel had exist function alc285_fixup_speaker2_to_dac1 to fixed dac for 0x17.
Replace as below.
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 <chiu@endlessm.com>
> Sent: Friday, December 27, 2019 2:57 PM
> To: perex@perex.cz; tiwai@suse.com; Kailang <kailang@realtek.com>;
> hui.wang@canonical.com; tomas.espeleta@gmail.com
> Cc: alsa-devel@alsa-project.org; linux-kernel@vger.kernel.org;
> linux@endlessm.com; Chris Chiu <chiu@endlessm.com>; Jian-Hong Pan
> <jian-hong@endlessm.com>
> Subject: [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC
>
> From: Chris Chiu <chiu@endlessm.com>
>
> 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 <chiu@endlessm.com>
> Signed-off-by: Jian-Hong Pan <jian-hong@endlessm.com>
> ---
> 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
next prev parent reply other threads:[~2019-12-27 7:30 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-27 6:57 [alsa-devel] [PATCH] ALSA: hda/realtek - Enable the subwoofer of ASUS UX431FLC Chris Chiu
2019-12-27 6:57 ` Chris Chiu
2019-12-27 7:28 ` Kailang [this message]
2019-12-27 7:28 ` Kailang
2019-12-27 8:18 ` [alsa-devel] " Takashi Iwai
2019-12-27 8:18 ` Takashi Iwai
2019-12-27 8:41 ` [alsa-devel] " Chris Chiu
2019-12-27 8:41 ` Chris Chiu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=9a6937eb53264ef99409ac234fffe8af@realtek.com \
--to=kailang@realtek.com \
--cc=alsa-devel@alsa-project.org \
--cc=chiu@endlessm.com \
--cc=hui.wang@canonical.com \
--cc=jian-hong@endlessm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@endlessm.com \
--cc=perex@perex.cz \
--cc=tiwai@suse.com \
--cc=tomas.espeleta@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.