drop queue-5.14/alsa-pci-rme-set-up-buffer-type-properly.patch

diff --git a/queue-5.14/alsa-pci-rme-set-up-buffer-type-properly.patch b/queue-5.14/alsa-pci-rme-set-up-buffer-type-properly.patch
deleted file mode 100644 (file)
index 97a4a2d..0000000
--- a/queue-5.14/alsa-pci-rme-set-up-buffer-type-properly.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 0899a7a23047f106c06888769d6cd6ff43d7395f Mon Sep 17 00:00:00 2001
-From: Takashi Iwai <tiwai@suse.de>
-Date: Mon, 9 Aug 2021 09:18:28 +0200
-Subject: ALSA: pci: rme: Set up buffer type properly
-
-From: Takashi Iwai <tiwai@suse.de>
-
-commit 0899a7a23047f106c06888769d6cd6ff43d7395f upstream.
-
-Although the regression of the mmap was fixed in the recent commit
-dc0dc8a73e8e ("ALSA: pcm: Fix mmap breakage without explicit buffer
-setup"), RME9652 and HDSP drivers have still potential issues with
-their mmap handling.  Namely, they use the default mmap handler
-without the standard buffer preallocation, and PCM core wouldn't use
-the coherent DMA mapping.  It's practically OK on x86, but on some
-exotic architectures, it wouldn't work.
-
-This patch addresses the potential breakage by replacing the buffer
-setup with the proper macro.  It also simplifies the source code,
-too.
-
-Link: https://lore.kernel.org/r/20210809071829.22238-3-tiwai@suse.de
-Signed-off-by: Takashi Iwai <tiwai@suse.de>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- sound/pci/rme9652/hdsp.c    |    6 ++----
- sound/pci/rme9652/rme9652.c |    6 ++----
- 2 files changed, 4 insertions(+), 8 deletions(-)
-
---- a/sound/pci/rme9652/hdsp.c
-+++ b/sound/pci/rme9652/hdsp.c
-@@ -4518,8 +4518,7 @@ static int snd_hdsp_playback_open(struct
-       snd_pcm_set_sync(substream);
- 
-         runtime->hw = snd_hdsp_playback_subinfo;
--      runtime->dma_area = hdsp->playback_buffer;
--      runtime->dma_bytes = HDSP_DMA_AREA_BYTES;
-+      snd_pcm_set_runtime_buffer(substream, hdsp->playback_dma_buf);
- 
-       hdsp->playback_pid = current->pid;
-       hdsp->playback_substream = substream;
-@@ -4595,8 +4594,7 @@ static int snd_hdsp_capture_open(struct
-       snd_pcm_set_sync(substream);
- 
-       runtime->hw = snd_hdsp_capture_subinfo;
--      runtime->dma_area = hdsp->capture_buffer;
--      runtime->dma_bytes = HDSP_DMA_AREA_BYTES;
-+      snd_pcm_set_runtime_buffer(substream, hdsp->capture_dma_buf);
- 
-       hdsp->capture_pid = current->pid;
-       hdsp->capture_substream = substream;
---- a/sound/pci/rme9652/rme9652.c
-+++ b/sound/pci/rme9652/rme9652.c
-@@ -2279,8 +2279,7 @@ static int snd_rme9652_playback_open(str
-       snd_pcm_set_sync(substream);
- 
-         runtime->hw = snd_rme9652_playback_subinfo;
--      runtime->dma_area = rme9652->playback_buffer;
--      runtime->dma_bytes = RME9652_DMA_AREA_BYTES;
-+      snd_pcm_set_runtime_buffer(substream, rme9652->playback_dma_buf);
- 
-       if (rme9652->capture_substream == NULL) {
-               rme9652_stop(rme9652);
-@@ -2339,8 +2338,7 @@ static int snd_rme9652_capture_open(stru
-       snd_pcm_set_sync(substream);
- 
-       runtime->hw = snd_rme9652_capture_subinfo;
--      runtime->dma_area = rme9652->capture_buffer;
--      runtime->dma_bytes = RME9652_DMA_AREA_BYTES;
-+      snd_pcm_set_runtime_buffer(substream, rme9652->capture_dma_buf);
- 
-       if (rme9652->playback_substream == NULL) {
-               rme9652_stop(rme9652);

diff --git a/queue-5.14/series b/queue-5.14/series
index 437bfb52c967d865d8f0beb4d30faa0e9db5b8d0..fddaeec5ff23377d44509b08b18626cd91d06ee1 100644 (file)
--- a/queue-5.14/series
+++ b/queue-5.14/series
@@ -1,3 +1,2 @@
 alsa-pcm-check-mmap-capability-of-runtime-dma-buffer-at-first.patch
-alsa-pci-rme-set-up-buffer-type-properly.patch
 alsa-pci-cs46xx-fix-set-up-buffer-type-properly.patch