lkml.org 
[lkml]   [2021]   [Aug]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.13 007/151] ASoC: amd: Fix reference to PCM buffer address
    Date
    From: Takashi Iwai <tiwai@suse.de>

    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>
    ---
    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(-)

    --- a/sound/soc/amd/acp-pcm-dma.c
    +++ b/sound/soc/amd/acp-pcm-dma.c
    @@ -969,7 +969,7 @@ static int acp_dma_hw_params(struct snd_

    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 */
    --- a/sound/soc/amd/raven/acp3x-pcm-dma.c
    +++ b/sound/soc/amd/raven/acp3x-pcm-dma.c
    @@ -286,7 +286,7 @@ static int acp3x_dma_hw_params(struct sn
    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;
    --- a/sound/soc/amd/renoir/acp3x-pdm-dma.c
    +++ b/sound/soc/amd/renoir/acp3x-pdm-dma.c
    @@ -246,7 +246,7 @@ static int acp_pdm_dma_hw_params(struct
    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,

    \
     
     \ /
      Last update: 2021-08-16 15:21    [W:4.148 / U:0.148 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site