From: Sasha Levin Date: Mon, 27 Apr 2020 13:11:46 +0000 (-0400) Subject: Fixes for 4.4 X-Git-Tag: v4.19.119~29 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b99cff063a1fe28c983cf5453a6b950ad0eda837;p=thirdparty%2Fkernel%2Fstable-queue.git Fixes for 4.4 Signed-off-by: Sasha Levin --- diff --git a/queue-4.4/alsa-hda-remove-asus-rog-zenith-from-the-blacklist.patch b/queue-4.4/alsa-hda-remove-asus-rog-zenith-from-the-blacklist.patch new file mode 100644 index 00000000000..3f81a4d3c7c --- /dev/null +++ b/queue-4.4/alsa-hda-remove-asus-rog-zenith-from-the-blacklist.patch @@ -0,0 +1,48 @@ +From efbdc60af67c2faf224f01c77e6e650fddd87cbd Mon Sep 17 00:00:00 2001 +From: Sasha Levin +Date: Sun, 19 Apr 2020 09:19:26 +0200 +Subject: ALSA: hda: Remove ASUS ROG Zenith from the blacklist + +From: Takashi Iwai + +[ Upstream commit a8cf44f085ac12c0b5b8750ebb3b436c7f455419 ] + +The commit 3c6fd1f07ed0 ("ALSA: hda: Add driver blacklist") added a +new blacklist for the devices that are known to have empty codecs, and +one of the entries was ASUS ROG Zenith II (PCI SSID 1043:874f). +However, it turned out that the very same PCI SSID is used for the +previous model that does have the valid HD-audio codecs and the change +broke the sound on it. + +This patch reverts the corresponding entry as a temporary solution. +Although Zenith II and co will see get the empty HD-audio bus again, +it'd be merely resource wastes and won't affect the functionality, +so it's no end of the world. We'll need to address this later, +e.g. by either switching to DMI string matching or using PCI ID & +SSID pairs. + +Fixes: 3c6fd1f07ed0 ("ALSA: hda: Add driver blacklist") +Reported-by: Johnathan Smithinovic +Cc: +Link: https://lore.kernel.org/r/20200419071926.22683-1-tiwai@suse.de +Signed-off-by: Takashi Iwai +Signed-off-by: Sasha Levin +--- + sound/pci/hda/hda_intel.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/sound/pci/hda/hda_intel.c b/sound/pci/hda/hda_intel.c +index faf2554397021..da9f6749b3be2 100644 +--- a/sound/pci/hda/hda_intel.c ++++ b/sound/pci/hda/hda_intel.c +@@ -1978,7 +1978,6 @@ static const struct hdac_io_ops pci_hda_io_ops = { + * should be ignored from the beginning. + */ + static const struct snd_pci_quirk driver_blacklist[] = { +- SND_PCI_QUIRK(0x1043, 0x874f, "ASUS ROG Zenith II / Strix", 0), + SND_PCI_QUIRK(0x1462, 0xcb59, "MSI TRX40 Creator", 0), + SND_PCI_QUIRK(0x1462, 0xcb60, "MSI TRX40", 0), + {} +-- +2.20.1 + diff --git a/queue-4.4/series b/queue-4.4/series index 36a46f96565..752b7184f9f 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -22,3 +22,4 @@ net-x25-fix-x25_neigh-refcnt-leak-when-receiving-frame.patch tcp-cache-line-align-max_tcp_header.patch team-fix-hang-in-team_mode_get.patch xfrm-always-set-xfrm_transformed-in-xfrm-4-6-_output_finish.patch +alsa-hda-remove-asus-rog-zenith-from-the-blacklist.patch