Skip to contentSkip to conversation

ASoC: intel: atom: Revert PCM buffer address setup workaround again

PATCH In review Takashi Iwai 1 participant 2 messages Aug 22, 2021 – Aug 23, 2021

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ASoC: intel: atom: Revert PCM buffer address setup workaround again

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.

---

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(-)
sound/soc/intel/atom/sst-mfld-platform-pcm.c +1 -1
index 905c7965f653..5db2f4865bbb 100644
@@ -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;
Signature · 1 line
2.26.2
#1 lore raw
Quoted 8 lines · Takashi Iwai

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.

Quoted 5 lines

---

The patch is to be applied on my for-next branch once after merging for-linus branch.

Now merged to for-next branch.

Takashi