xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ASoC: amd: Fix reference to PCM buffer address

Browse Source 
commit 8b5d95313b6d30f642e4ed0125891984c446604e upstream.

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.

Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20210731084331.32225-1-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Takashi Iwai
2021-07-31 10:43:31 +02:00
committed by Greg Kroah-Hartman
parent 0c9adae117
commit c419c4c91b
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sound/soc/amd/acp-pcm-dma.c
View File

@@ -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); acp_set_sram_bank_state(rtd->acp_mmio, 0, true);
/* Save for runtime private data */ /* Save for runtime private data */
rtd->dma_addr = substream->dma_buffer.addr; rtd->dma_addr = runtime->dma_addr;
rtd->order = get_order(size); rtd->order = get_order(size);
/* Fill the page table entries in ACP SRAM */ /* Fill the page table entries in ACP SRAM */

2
sound/soc/amd/raven/acp3x-pcm-dma.c
View File

@@ -288,7 +288,7 @@ static int acp3x_dma_hw_params(struct snd_soc_component *component,
pr_err("pinfo failed\n"); pr_err("pinfo failed\n");
} }
size = params_buffer_bytes(params); 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); rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT);
config_acp3x_dma(rtd, substream->stream); config_acp3x_dma(rtd, substream->stream);
return 0; return 0;

2
sound/soc/amd/renoir/acp3x-pdm-dma.c
View File

@@ -248,7 +248,7 @@ static int acp_pdm_dma_hw_params(struct snd_soc_component *component,
return -EINVAL; return -EINVAL;
size = params_buffer_bytes(params); size = params_buffer_bytes(params);
period_bytes = params_period_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); rtd->num_pages = (PAGE_ALIGN(size) >> PAGE_SHIFT);
config_acp_dma(rtd, substream->stream); config_acp_dma(rtd, substream->stream);
init_pdm_ring_buffer(MEM_WINDOW_START, size, period_bytes, init_pdm_ring_buffer(MEM_WINDOW_START, size, period_bytes,