lkml.org 
[lkml]   [2021]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.14 44/59] ASoC: intel: atom: Revert PCM buffer address setup workaround again
    Date
    From: Takashi Iwai <tiwai@suse.de>

    [ Upstream commit e28ac04a705e946eddc5e7d2fc712dea3f20fe9e ]

    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.

    Link: https://lore.kernel.org/r/20210822072127.9786-1-tiwai@suse.de
    Signed-off-by: Takashi Iwai <tiwai@suse.de>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    diff --git a/sound/soc/intel/atom/sst-mfld-platform-pcm.c b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    index 96f7facd0fa0..c877326cb0a6 100644
    --- a/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    +++ b/sound/soc/intel/atom/sst-mfld-platform-pcm.c
    @@ -135,7 +135,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;
    --
    2.30.2
    \
     
     \ /
      Last update: 2021-09-09 15:17    [W:4.188 / U:0.592 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site