[d-kernel] [PATCH] Revert "ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open()"

nickel на altlinux.org nickel на altlinux.org
Чт Дек 29 09:37:35 MSK 2022


From: Nikolai Kostrigin <nickel at altlinux.org>

This reverts commit c34db0d6b88b1da95e7ab3353e674f4f574cccee.

Sudden sound disappearance was reported for some laptops, e.g.
Acer Swift 3 SF314-59-78UR 11th Gen Intel(R) Core(TM) i7-1165G7 @ 2.80GHz

lspci
0000:00:1f.3 Multimedia audio controller: Intel Corporation Tiger Lake-LP Smart Sound Technology Audio Controller (rev 20)
        Subsystem: Acer Incorporated [ALI] Device 148c
        Flags: bus master, fast devsel, latency 32, IRQ 197, IOMMU group 12
        Memory at 601f270000 (64-bit, non-prefetchable) [size=16K]
        Memory at 601f000000 (64-bit, non-prefetchable) [size=1M]
        Capabilities: [50] Power Management version 3
        Capabilities: [80] Vendor Specific Information: Len=14 <?>
        Capabilities: [60] MSI: Enable+ Count=1/1 Maskable- 64bit+
        Kernel driver in use: sof-audio-pci

Bisection revealed the commit being reverted.

Reported-by: Oleg Obidin <obidinog at basealt.ru>
Link: https://bugzilla.altlinux.org/44690
Signed-off-by: Nikolai Kostrigin <nickel at altlinux.org>
---
 sound/soc/soc-pcm.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 0e2261ee07b67..8b8a9aca2912f 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -723,6 +723,11 @@ static int soc_pcm_open(struct snd_pcm_substream *substream)
 		ret = snd_soc_dai_startup(dai, substream);
 		if (ret < 0)
 			goto err;
+
+		if (substream->stream == SNDRV_PCM_STREAM_PLAYBACK)
+			dai->tx_mask = 0;
+		else
+			dai->rx_mask = 0;
 	}
 
 	/* Dynamic PCM DAI links compat checks use dynamic capabilities */
-- 
2.33.5



Подробная информация о списке рассылки devel-kernel