5.10-stable patches

added patches:
	alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch
	alsa-hda-realtek-modify-dell-platform-name.patch

diff --git a/queue-5.10/alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch b/queue-5.10/alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch
new file mode 100644 (file)
index 0000000..4458bb7
--- /dev/null
+++ b/queue-5.10/alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch
@@ -0,0 +1,37 @@
+From 3d5c5fdcee0f9a94deb0472e594706018b00aa31 Mon Sep 17 00:00:00 2001
+From: Takashi Iwai <tiwai@suse.de>
+Date: Fri, 1 Jan 2021 09:38:52 +0100
+Subject: ALSA: hda/hdmi: Fix incorrect mutex unlock in silent_stream_disable()
+
+From: Takashi Iwai <tiwai@suse.de>
+
+commit 3d5c5fdcee0f9a94deb0472e594706018b00aa31 upstream.
+
+The silent_stream_disable() function introduced by the commit
+b1a5039759cb ("ALSA: hda/hdmi: fix silent stream for first playback to
+DP") takes the per_pin->lock mutex, but it unlocks the wrong one,
+spec->pcm_lock, which causes a deadlock.  This patch corrects it.
+
+Fixes: b1a5039759cb ("ALSA: hda/hdmi: fix silent stream for first playback to DP")
+Reported-by: Jan Alexander Steffens (heftig) <heftig@archlinux.org>
+Cc: <stable@vger.kernel.org>
+Acked-by: Kai Vehmanen <kai.vehmanen@linux.intel.com>
+Link: https://lore.kernel.org/r/20210101083852.12094-1-tiwai@suse.de
+Signed-off-by: Takashi Iwai <tiwai@suse.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ sound/pci/hda/patch_hdmi.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_hdmi.c
++++ b/sound/pci/hda/patch_hdmi.c
+@@ -1736,7 +1736,7 @@ static void silent_stream_disable(struct
+       per_pin->silent_stream = false;
+ 
+  unlock_out:
+-      mutex_unlock(&spec->pcm_lock);
++      mutex_unlock(&per_pin->lock);
+ }
+ 
+ /* update ELD and jack state via audio component */

diff --git a/queue-5.10/alsa-hda-realtek-modify-dell-platform-name.patch b/queue-5.10/alsa-hda-realtek-modify-dell-platform-name.patch
new file mode 100644 (file)
index 0000000..f095fc5
--- /dev/null
+++ b/queue-5.10/alsa-hda-realtek-modify-dell-platform-name.patch
@@ -0,0 +1,34 @@
+From c1e8952395c1f44a6304c71401519d19ed2ac56a Mon Sep 17 00:00:00 2001
+From: Kailang Yang <kailang@realtek.com>
+Date: Wed, 23 Dec 2020 15:34:57 +0800
+Subject: ALSA: hda/realtek - Modify Dell platform name
+
+From: Kailang Yang <kailang@realtek.com>
+
+commit c1e8952395c1f44a6304c71401519d19ed2ac56a upstream.
+
+Dell platform SSID:0x0a58 change platform name.
+Use the generic name instead for avoiding confusion.
+
+Fixes: 150927c3674d ("ALSA: hda/realtek - Supported Dell fixed type headset")
+Signed-off-by: Kailang Yang <kailang@realtek.com>
+Cc: <stable@vger.kernel.org>
+Link: https://lore.kernel.org/r/efe7c196158241aa817229df7835d645@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 |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/sound/pci/hda/patch_realtek.c
++++ b/sound/pci/hda/patch_realtek.c
+@@ -7885,7 +7885,7 @@ static const struct snd_pci_quirk alc269
+       SND_PCI_QUIRK(0x1028, 0x09bf, "Dell Precision", ALC233_FIXUP_ASUS_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1028, 0x0a2e, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1028, 0x0a30, "Dell", ALC236_FIXUP_DELL_AIO_HEADSET_MIC),
+-      SND_PCI_QUIRK(0x1028, 0x0a58, "Dell Precision 3650 Tower", ALC255_FIXUP_DELL_HEADSET_MIC),
++      SND_PCI_QUIRK(0x1028, 0x0a58, "Dell", ALC255_FIXUP_DELL_HEADSET_MIC),
+       SND_PCI_QUIRK(0x1028, 0x164a, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x1028, 0x164b, "Dell", ALC293_FIXUP_DELL1_MIC_NO_PRESENCE),
+       SND_PCI_QUIRK(0x103c, 0x1586, "HP", ALC269_FIXUP_HP_MUTE_LED_MIC2),

diff --git a/queue-5.10/series b/queue-5.10/series
index 8459818d8bdc23944a97aa7a411730fde0be7a87..e48455397449608f62e3a49d843dffed03286bd1 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -5,3 +5,5 @@ rtc-pcf2127-only-use-watchdog-when-explicitly-available.patch
 dt-bindings-rtc-add-reset-source-property.patch
 kdev_t-always-inline-major-minor-helper-functions.patch
 bluetooth-fix-attempting-to-set-rpa-timeout-when-unsupported.patch
+alsa-hda-realtek-modify-dell-platform-name.patch
+alsa-hda-hdmi-fix-incorrect-mutex-unlock-in-silent_stream_disable.patch