| Message ID | 20210822072127.9786-1-tiwai@suse.de (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | e28ac04a705e946eddc5e7d2fc712dea3f20fe9e |
| Headers | show |
| Series | [for-5.15] ASoC: intel: atom: Revert PCM buffer address setup workaround again | expand |
On Sun, 22 Aug 2021 09:21:27 +0200, Takashi Iwai wrote: > > 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. > > Signed-off-by: Takashi Iwai <tiwai@suse.de> > --- > > The patch is to be applied on my for-next branch once after merging > for-linus branch. Now merged to for-next branch. Takashi
diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c index 905c7965f653..5db2f4865bbb 100644 --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c @@ -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;
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. Signed-off-by: Takashi Iwai <tiwai@suse.de> --- The patch is to be applied on my for-next branch once after merging for-linus branch. sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)