]> git.proxmox.com Git - mirror_ubuntu-jammy-kernel.git/commitdiff
ASoC: intel: atom: Revert PCM buffer address setup workaround again
authorTakashi Iwai <tiwai@suse.de>
Sun, 22 Aug 2021 07:21:27 +0000 (09:21 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 23 Aug 2021 11:36:31 +0000 (13:36 +0200)
We worked around the breakage of PCM buffer setup by the commit
65ca89c2b12c ("ASoC: intel: atom: Fix breakage for PCM buffer address
setup"), but this isn't necessary since the CONTINUOUS buffer type
also sets runtime->dma_addr since commit f84ba106a018 ("ALSA:
memalloc: Store snd_dma_buffer.addr for continuous pages, too").
Let's revert the change again.

Link: https://lore.kernel.org/r/20210822072127.9786-1-tiwai@suse.de
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/soc/intel/atom/sst-mfld-platform-pcm.c

index 905c7965f6539ab121efd535630520c6f460f650..5db2f4865bbba93138789a22af84515f97921910 100644 (file)
@@ -127,7 +127,7 @@ static void sst_fill_alloc_params(struct snd_pcm_substream *substream,
        snd_pcm_uframes_t period_size;
        ssize_t periodbytes;
        ssize_t buffer_bytes = snd_pcm_lib_buffer_bytes(substream);
-       u32 buffer_addr = virt_to_phys(substream->runtime->dma_area);
+       u32 buffer_addr = substream->runtime->dma_addr;
 
        channels = substream->runtime->channels;
        period_size = substream->runtime->period_size;