From: Mark Brown <broonie@kernel•org>
To: Takashi Iwai <tiwai@suse•de>
Cc: Jai Luthra <j-luthra@ti•com>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Mark Brown <broonie@kernel•org>,
Shengjiu Wang <shengjiu.wang@nxp•com>
Subject: linux-next: manual merge of the sound tree with the sound-asoc-fixes tree
Date: Wed, 26 Jun 2024 17:59:40 +0100 [thread overview]
Message-ID: <ZnxI_O6OrGKN9XxE@sirena.org.uk> (raw)
[-- Attachment #1: Type: text/plain, Size: 1783 bytes --]
Hi all,
Today's linux-next merge of the sound tree got a conflict in:
sound/core/pcm_dmaengine.c
between commit:
e8343410ddf08 ("ALSA: dmaengine: Synchronize dma channel after drop()")
from the sound-asoc-fixes tree and commit:
6a7db25aad8ce ("ALSA: dmaengine_pcm: terminate dmaengine before synchronize")
from the sound tree.
I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging. You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.
diff --cc sound/core/pcm_dmaengine.c
index cc5db93b9132c,4f18511f1c92e..0000000000000
--- a/sound/core/pcm_dmaengine.c
+++ b/sound/core/pcm_dmaengine.c
@@@ -349,23 -349,8 +349,18 @@@ int snd_dmaengine_pcm_open_request_chan
}
EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_open_request_chan);
+int snd_dmaengine_pcm_sync_stop(struct snd_pcm_substream *substream)
+{
+ struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
+
+ dmaengine_synchronize(prtd->dma_chan);
+
+ return 0;
+}
+EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_sync_stop);
+
- /**
- * snd_dmaengine_pcm_close - Close a dmaengine based PCM substream
- * @substream: PCM substream
- *
- * Return: 0 on success, a negative error code otherwise
- */
- int snd_dmaengine_pcm_close(struct snd_pcm_substream *substream)
+ static void __snd_dmaengine_pcm_close(struct snd_pcm_substream *substream,
+ bool release_channel)
{
struct dmaengine_pcm_runtime_data *prtd = substream_to_prtd(substream);
struct dma_tx_state state;
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next reply other threads:[~2024-06-26 16:59 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-06-26 16:59 Mark Brown [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-10-30 0:41 linux-next: manual merge of the sound tree with the sound-asoc-fixes tree Stephen Rothwell
2023-10-30 0:44 ` Stephen Rothwell
2023-08-18 2:55 Stephen Rothwell
2019-02-19 1:31 Stephen Rothwell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=ZnxI_O6OrGKN9XxE@sirena.org.uk \
--to=broonie@kernel$(echo .)org \
--cc=j-luthra@ti$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=shengjiu.wang@nxp$(echo .)com \
--cc=tiwai@suse$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox