[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1028565: Acknowledgement (upgrade-reports: Audio breaks between 5.10.0-19-amd64 and 5.10.0-20-amd64) Inbox



FTR: There is already an alternative fix committed in the Debian Kernel repo:
https://salsa.debian.org/kernel-team/linux/-/commit/4a65ff78c6be9208bfc9232886a7a2d199ebcac7

So what I'll describe below is how you would do it.

On Thursday, 19 January 2023 18:46:57 CET Markus Kramer wrote:
> How do I boot from this kernel?  Using dpkg -i arch/x86/boot/bzImage ?

To use `dpkg -i` you'd need a .deb file (ie Debian package)

> How could GRUB show this kernel as e.g. "before-patch", or will it
> show the creation time?
> 
> Where do I get the .patch file mentioned in
> https://kernel-team.pages.debian.net/kernel-handbook/ch-common-tasks.html#s4
> .2.2 ?

The 'problematic' commit was c34db0d6b88b and we need a revert of that:

diederik@prancing-pony:~/dev/kernel.org/linux$ git revert c34db0d6b88b
Auto-merging sound/soc/soc-pcm.c
[linux-5.10.y 3ed496982f55] Revert "ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open()"
 1 file changed, 5 insertions(+)
diederik@prancing-pony:~/dev/kernel.org/linux$ git format-patch HEAD~1 -o ../patches/
../patches/0001-Revert-ASoC-soc-pcm-Don-t-zero-TDM-masks-in-__soc_pc.patch

And that's how you'd get the .patch file which I have attached as a convenience.

If you then follow the procedure at #s4.2.2 and provide that patch file as an
argument, it would build a .deb file of the patched kernel.
That .deb file you can then install with `dpkg -i <deb-file>`.

Currently, (unfortunately?), it would replace your existing 5.10.0-20-amd64
kernel and there is no (easy) way to see that you would be booting into
your new patched kernel from GRUB.

HTH,
  Diederik
>From 3ed496982f556d17a87f830acaf5023d4f5d9a9b Mon Sep 17 00:00:00 2001
From: Diederik de Haas <didi.debian@cknow.org>
Date: Thu, 19 Jan 2023 18:32:38 +0100
Subject: [PATCH] Revert "ASoC: soc-pcm: Don't zero TDM masks in
 __soc_pcm_open()"

This reverts commit c34db0d6b88b1da95e7ab3353e674f4f574cccee.
---
 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 fb874f924bbe..9a60d62f12fe 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.39.0

Attachment: signature.asc
Description: This is a digitally signed message part.


Reply to: