6.1-stable patches

added patches:
	alsa-hda-realtek-fixed-two-speaker-platform.patch

diff --git a/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch b/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch
new file mode 100644 (file)
index 0000000..edb0866
--- /dev/null
+++ b/queue-6.1/alsa-hda-realtek-fixed-two-speaker-platform.patch
@@ -0,0 +1,36 @@
+From fb6254df09bba303db2a1002085f6c0b90a456ed Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Tue, 12 Sep 2023 15:31:49 +0800
+Subject: ALSA: hda/realtek - Fixed two speaker platform
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit fb6254df09bba303db2a1002085f6c0b90a456ed upstream.
+
+If system has two speakers and one connect to 0x14 pin, use this
+function will disable it.
+
+Fixes: e43252db7e20 ("ALSA: hda/realtek - ALC287 I2S speaker platform support")
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Link: https://lore.kernel.org/r/e3f2aac3fe6a47079d728a6443358cc2@realtek.com
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ sound/pci/hda/patch_realtek.c |    6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -7001,8 +7001,10 @@ static void alc287_fixup_bind_dacs(struc
+       snd_hda_override_conn_list(codec, 0x17, ARRAY_SIZE(conn), conn);
+       spec->gen.preferred_dacs = preferred_pairs;
+       spec->gen.auto_mute_via_amp = 1;
+-      snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
+-                          0x0); /* Make sure 0x14 was disable */
++      if (spec->gen.autocfg.speaker_pins[0] != 0x14) {
++              snd_hda_codec_write_cache(codec, 0x14, 0, AC_VERB_SET_PIN_WIDGET_CONTROL,
++                                      0x0); /* Make sure 0x14 was disable */
++      }
+ }
+ 
+ 

diff --git a/queue-6.1/series b/queue-6.1/series
index 4b093984e0041973d4114998aacf44c563d0a907..49e1f1efb4f419b0ca6cb56de06324cdcaaa4eea 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -128,3 +128,4 @@ dmaengine-idxd-use-spin_lock_irqsave-before-wait_eve.patch
 dmaengine-mediatek-fix-deadlock-caused-by-synchroniz.patch
 powerpc-8xx-fix-pte_access_permitted-for-page_none.patch
 powerpc-64e-fix-wrong-test-in-__ptep_test_and_clear_.patch
+alsa-hda-realtek-fixed-two-speaker-platform.patch