ASoC: SOF: Use managed buffer allocation

Clean up the drivers with the new managed buffer allocation API.
The superfluous snd_pcm_lib_malloc_pages() and
snd_pcm_lib_free_pages() calls are dropped.

Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Link: https://lore.kernel.org/r/20191211172019.23206-2-tiwai@suse.de
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/sof/pcm.c b/sound/soc/sof/pcm.c
index 67ba317942d36980d3e7378c0133f485891a1736..86829e5bd62d508b4086f274fff59a630d71ee2b 100644 (file)
--- a/sound/soc/sof/pcm.c
+++ b/sound/soc/sof/pcm.c
@@ -118,20 +118,8 @@ static int sof_pcm_hw_params(struct snd_soc_component *component,
 
        memset(&pcm, 0, sizeof(pcm));
 
-       /* allocate audio buffer pages */
-       ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(params));
-       if (ret < 0) {
-               dev_err(component->dev, "error: could not allocate %d bytes for PCM %d\n",
-                       params_buffer_bytes(params), spcm->pcm.pcm_id);
-               return ret;
-       }
-       if (ret) {
-               /*
-                * ret == 1 means the buffer is changed
-                * create compressed page table for audio firmware
-                * ret == 0 means the buffer is not changed
-                * so no need to regenerate the page table
-                */
+       /* create compressed page table for audio firmware */
+       if (runtime->buffer_changed) {
                ret = create_page_table(component, substream, runtime->dma_area,
                                        runtime->dma_bytes);
                if (ret < 0)
@@ -259,8 +247,6 @@ static int sof_pcm_hw_free(struct snd_soc_component *component,
                        err = ret;
        }
 
-       snd_pcm_lib_free_pages(substream);
-
        cancel_work_sync(&spcm->stream[substream->stream].period_elapsed_work);
 
        ret = snd_sof_pcm_platform_hw_free(sdev, substream);
@@ -596,10 +582,10 @@ static int sof_pcm_new(struct snd_soc_component *component,
                "spcm: allocate %s playback DMA buffer size 0x%x max 0x%x\n",
                caps->name, caps->buffer_size_min, caps->buffer_size_max);
 
-       snd_pcm_lib_preallocate_pages(pcm->streams[stream].substream,
-                                     SNDRV_DMA_TYPE_DEV_SG, sdev->dev,
-                                     le32_to_cpu(caps->buffer_size_min),
-                                     le32_to_cpu(caps->buffer_size_max));
+       snd_pcm_set_managed_buffer(pcm->streams[stream].substream,
+                                  SNDRV_DMA_TYPE_DEV_SG, sdev->dev,
+                                  le32_to_cpu(caps->buffer_size_min),
+                                  le32_to_cpu(caps->buffer_size_max));
 capture:
        stream = SNDRV_PCM_STREAM_CAPTURE;
 
@@ -614,10 +600,10 @@ capture:
                "spcm: allocate %s capture DMA buffer size 0x%x max 0x%x\n",
                caps->name, caps->buffer_size_min, caps->buffer_size_max);
 
-       snd_pcm_lib_preallocate_pages(pcm->streams[stream].substream,
-                                     SNDRV_DMA_TYPE_DEV_SG, sdev->dev,
-                                     le32_to_cpu(caps->buffer_size_min),
-                                     le32_to_cpu(caps->buffer_size_max));
+       snd_pcm_set_managed_buffer(pcm->streams[stream].substream,
+                                  SNDRV_DMA_TYPE_DEV_SG, sdev->dev,
+                                  le32_to_cpu(caps->buffer_size_min),
+                                  le32_to_cpu(caps->buffer_size_max));
 
        return 0;
 }