ASoC: amd: Fix reference to PCM buffer address
Subsystems (3)
PATCH v2 1/1 ASoC: amd: Fix reference to PCM buffer address
PCM buffers might be allocated dynamically when the buffer preallocation failed or a larger buffer is requested, and it's not guaranteed that substream->dma_buffer points to the actually used buffer. The driver needs to refer to substream->runtime->dma_addr instead for the buffer address.
---v1->v2: Fix build error of renoir driver
sound/soc/amd/acp-pcm-dma.c | 2 +- sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
sound/soc/amd/acp-pcm-dma.c +1 -1
@@ -969,7 +969,7 @@ static int acp_dma_hw_params(struct snd_soc_component *component,acp_set_sram_bank_state (rtd->acp_mmio,0 , true);/* Save for runtime private data */ - rtd->dma_addr = substream->dma_buffer.addr; + rtd->dma_addr = runtime->dma_addr; rtd->order =get_order (size);/* Fill the page table entries in ACP SRAM */
sound/soc/amd/raven/acp3x-pcm-dma.c +1 -1
@@ -286,7 +286,7 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component,pr_err ("pinfo failed\n" ); } size =params_buffer_bytes (params); - rtd->dma_addr = substream->dma_buffer.addr; + rtd->dma_addr = substream->runtime->dma_addr; rtd->num_pages = (PAGE_ALIGN (size) >>PAGE_SHIFT );config_acp3x_dma (rtd, substream->stream);return 0 ;
sound/soc/amd/renoir/acp3x-pdm-dma.c +1 -1
@@ -242,7 +242,7 @@ static int acp_pdm_dma_hw_params(struct snd_soc_component *component,return -EINVAL ; size =params_buffer_bytes (params); period_bytes =params_period_bytes (params); - rtd->dma_addr = substream->dma_buffer.addr; + rtd->dma_addr = substream->runtime->dma_addr; rtd->num_pages = (PAGE_ALIGN (size) >>PAGE_SHIFT );config_acp_dma (rtd, substream->stream); init_pdm_ring_buffer(MEM_WINDOW_START, size, period_bytes,
Signature · 1 line
2.26.2
Mark Brown
maintainerQuoted 5 lines · Takashi Iwai
PCM buffers might be allocated dynamically when the buffer preallocation failed or a larger buffer is requested, and it's not guaranteed that
substream->dma_bufferpoints to the actually used buffer. The driver needs to refer tosubstream->runtime->dma_addrinstead for the buffer address.
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/1] ASoC: amd: Fix reference to PCM buffer address
commit: 8b5d95313b6d30f642e4ed0125891984c446604e
All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark