[PATCH 1/2] Revert "ALSA: hda/realtek: Fix pop noise on ALC225"

[PATCH 1/2] Revert "ALSA: hda/realtek: Fix pop noise on ALC225"

[Kai-Heng Feng]

This reverts commit 3b36b13d5e69d6f51ff1c55d1b404a74646c9757.

Enable power save node breaks some systems with ACL225. Revert the patch
and use a platform specific quirk for the original issue isntead.

Fixes: 3b36b13d5e69 ("ALSA: hda/realtek: Fix pop noise on ALC225")
BugLink: https://bugs.launchpad.net/bugs/1875916
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index b26f0acfd86e..dedf0c17f198 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -8246,8 +8246,6 @@ static int patch_alc269(struct hda_codec *codec)
 		spec->gen.mixer_nid = 0;
 		break;
 	case 0x10ec0225:
-		codec->power_save_node = 1;
-		/* fall through */
 	case 0x10ec0295:
 	case 0x10ec0299:
 		spec->codec_variant = ALC269_TYPE_ALC225;
-- 
2.17.1

[PATCH 2/2] ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse

[Kai-Heng Feng]

Commit 317d9313925c ("ALSA: hda/realtek - Set default power save node to
0") makes the ALC225 have pop noise on S3 resume and cold boot.

The previous fix enable power save node universally for ALC225, however
it makes some ALC225 systems unable to produce any sound.

So let's only enable power save node for the affected Dell Wyse
platform.

Fixes: 317d9313925c ("ALSA: hda/realtek - Set default power save node to 0")
BugLink: https://bugs.launchpad.net/bugs/1866357
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
 sound/pci/hda/patch_realtek.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c
index dedf0c17f198..c34b8843bb25 100644
--- a/sound/pci/hda/patch_realtek.c
+++ b/sound/pci/hda/patch_realtek.c
@@ -5893,6 +5893,15 @@ static void alc233_alc662_fixup_lenovo_dual_codecs(struct hda_codec *codec,
 	}
 }
 
+static void alc225_fixup_s3_pop_noise(struct hda_codec *codec,
+				      const struct hda_fixup *fix, int action)
+{
+	if (action != HDA_FIXUP_ACT_PRE_PROBE)
+		return;
+
+	codec->power_save_node = 1;
+}
+
 /* Forcibly assign NID 0x03 to HP/LO while NID 0x02 to SPK for EQ */
 static void alc274_fixup_bind_dacs(struct hda_codec *codec,
 				    const struct hda_fixup *fix, int action)
@@ -6082,6 +6091,7 @@ enum {
 	ALC233_FIXUP_ACER_HEADSET_MIC,
 	ALC294_FIXUP_LENOVO_MIC_LOCATION,
 	ALC225_FIXUP_DELL_WYSE_MIC_NO_PRESENCE,
+	ALC225_FIXUP_S3_POP_NOISE,
 	ALC700_FIXUP_INTEL_REFERENCE,
 	ALC274_FIXUP_DELL_BIND_DACS,
 	ALC274_FIXUP_DELL_AIO_LINEOUT_VERB,
@@ -6969,6 +6979,12 @@ static const struct hda_fixup alc269_fixups[] = {
 			{ }
 		},
 		.chained = true,
+		.chain_id = ALC225_FIXUP_S3_POP_NOISE
+	},
+	[ALC225_FIXUP_S3_POP_NOISE] = {
+		.type = HDA_FIXUP_FUNC,
+		.v.func = alc225_fixup_s3_pop_noise,
+		.chained = true,
 		.chain_id = ALC269_FIXUP_HEADSET_MODE_NO_HP_MIC
 	},
 	[ALC700_FIXUP_INTEL_REFERENCE] = {
-- 
2.17.1

Re: [PATCH 1/2] Revert "ALSA: hda/realtek: Fix pop noise on ALC225"

[Takashi Iwai]

On Sun, 03 May 2020 17:24:46 +0200,
Kai-Heng Feng wrote:
> 
> This reverts commit 3b36b13d5e69d6f51ff1c55d1b404a74646c9757.
> 
> Enable power save node breaks some systems with ACL225. Revert the patch
> and use a platform specific quirk for the original issue isntead.
> 
> Fixes: 3b36b13d5e69 ("ALSA: hda/realtek: Fix pop noise on ALC225")
> BugLink: https://bugs.launchpad.net/bugs/1875916
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>

Applied now.  Thanks.


Takashi

Re: [PATCH 2/2] ALSA: hda/realtek - Fix S3 pop noise on Dell Wyse

[Takashi Iwai]

On Sun, 03 May 2020 17:24:47 +0200,
Kai-Heng Feng wrote:
> 
> Commit 317d9313925c ("ALSA: hda/realtek - Set default power save node to
> 0") makes the ALC225 have pop noise on S3 resume and cold boot.
> 
> The previous fix enable power save node universally for ALC225, however
> it makes some ALC225 systems unable to produce any sound.
> 
> So let's only enable power save node for the affected Dell Wyse
> platform.
> 
> Fixes: 317d9313925c ("ALSA: hda/realtek - Set default power save node to 0")
> BugLink: https://bugs.launchpad.net/bugs/1866357
> Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>

Applied, thanks.


Takashi