From: Takashi Iwai <tiwai@suse.de>
To: Mark Brown <broonie@kernel.org>
Cc: alsa-devel@alsa-project.org, Takashi Iwai <tiwai@suse.de>,
Jie Yang <yang.jie@linux.intel.com>,
Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>
Subject: [alsa-devel] [PATCH for-5.6 23/23] ASoC: intel: skylake: Use managed buffer allocation
Date: Tue, 10 Dec 2019 15:26:14 +0100 [thread overview]
Message-ID: <20191210142614.19405-24-tiwai@suse.de> (raw)
In-Reply-To: <20191210142614.19405-1-tiwai@suse.de>
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.
The pcm_construct ops contains only the superfluous call of
snd_pcm_lib_preallocate_free_for_all(), so dropped, too.
Cc: Cezary Rojewski <cezary.rojewski@intel.com>
Cc: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Cc: Liam Girdwood <liam.r.girdwood@linux.intel.com>
Cc: Jie Yang <yang.jie@linux.intel.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/intel/skylake/skl-pcm.c | 26 ++++++--------------------
1 file changed, 6 insertions(+), 20 deletions(-)
diff --git a/sound/soc/intel/skylake/skl-pcm.c b/sound/soc/intel/skylake/skl-pcm.c
index 8b9abb79a69e..ce14fa735d73 100644
--- a/sound/soc/intel/skylake/skl-pcm.c
+++ b/sound/soc/intel/skylake/skl-pcm.c
@@ -77,13 +77,7 @@ static int skl_substream_alloc_pages(struct hdac_bus *bus,
hdac_stream(stream)->period_bytes = 0;
hdac_stream(stream)->format_val = 0;
- return snd_pcm_lib_malloc_pages(substream, size);
-}
-
-static int skl_substream_free_pages(struct hdac_bus *bus,
- struct snd_pcm_substream *substream)
-{
- return snd_pcm_lib_free_pages(substream);
+ return 0;
}
static void skl_set_pcm_constrains(struct hdac_bus *bus,
@@ -385,7 +379,6 @@ static void skl_pcm_close(struct snd_pcm_substream *substream,
static int skl_pcm_hw_free(struct snd_pcm_substream *substream,
struct snd_soc_dai *dai)
{
- struct hdac_bus *bus = dev_get_drvdata(dai->dev);
struct hdac_ext_stream *stream = get_hdac_ext_stream(substream);
struct skl_dev *skl = get_skl_ctx(dai->dev);
struct skl_module_cfg *mconfig;
@@ -405,7 +398,7 @@ static int skl_pcm_hw_free(struct snd_pcm_substream *substream,
snd_hdac_stream_cleanup(hdac_stream(stream));
hdac_stream(stream)->prepared = 0;
- return skl_substream_free_pages(bus, substream);
+ return 0;
}
static int skl_be_hw_params(struct snd_pcm_substream *substream,
@@ -1289,12 +1282,6 @@ static int skl_platform_soc_get_time_info(
return 0;
}
-static void skl_platform_soc_free(struct snd_soc_component *component,
- struct snd_pcm *pcm)
-{
- snd_pcm_lib_preallocate_free_for_all(pcm);
-}
-
#define MAX_PREALLOC_SIZE (32 * 1024 * 1024)
static int skl_platform_soc_new(struct snd_soc_component *component,
@@ -1312,10 +1299,10 @@ static int skl_platform_soc_new(struct snd_soc_component *component,
size = CONFIG_SND_HDA_PREALLOC_SIZE * 1024;
if (size > MAX_PREALLOC_SIZE)
size = MAX_PREALLOC_SIZE;
- snd_pcm_lib_preallocate_pages_for_all(pcm,
- SNDRV_DMA_TYPE_DEV_SG,
- &skl->pci->dev,
- size, MAX_PREALLOC_SIZE);
+ snd_pcm_set_managed_buffer_all(pcm,
+ SNDRV_DMA_TYPE_DEV_SG,
+ &skl->pci->dev,
+ size, MAX_PREALLOC_SIZE);
}
return 0;
@@ -1483,7 +1470,6 @@ static const struct snd_soc_component_driver skl_component = {
.get_time_info = skl_platform_soc_get_time_info,
.mmap = skl_platform_soc_mmap,
.pcm_construct = skl_platform_soc_new,
- .pcm_destruct = skl_platform_soc_free,
.module_get_upon_open = 1, /* increment refcount when a pcm is opened */
};
--
2.16.4
_______________________________________________
Alsa-devel mailing list
Alsa-devel@alsa-project.org
https://mailman.alsa-project.org/mailman/listinfo/alsa-devel
next prev parent reply other threads:[~2019-12-10 14:41 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-10 14:25 [alsa-devel] [PATCH for-5.6 00/23] ASoC: PCM API updates (part I) Takashi Iwai
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 01/23] ASoC: amd: Use managed buffer allocation Takashi Iwai
2019-12-11 16:54 ` [alsa-devel] Applied "ASoC: amd: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 02/23] ASoC: au1x: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: au1x: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 03/23] ASoC: dwc: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: dwc: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 04/23] ASoC: mediatek: Use managed buffer allocation Takashi Iwai
2019-12-11 16:47 ` Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 05/23] ASoC: meson: " Takashi Iwai
2019-12-11 9:49 ` Jerome Brunet
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: meson: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 06/23] ASoC: dma-sh7760: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: dma-sh7760: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 07/23] ASoC: fsi: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: fsi: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:25 ` [alsa-devel] [PATCH for-5.6 08/23] ASoC: rcar: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: rcar: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 09/23] ASoC: siu_pcm: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: siu_pcm: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 10/23] ASoC: generic-dmaengine-pcm: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: generic-dmaengine-pcm: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 11/23] ASoC: SOF: Use managed buffer allocation Takashi Iwai
2019-12-11 16:47 ` Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 12/23] ASoC: stm32: " Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: stm32: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 13/23] ASoC: txx9: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: txx9: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 14/23] ASoC: uniphier: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: uniphier: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 15/23] ASoC: xilinx: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: xilinx: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 16/23] ASoC: xtensa: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: xtensa: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 17/23] ASoC: cros_ec_codec: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: cros_ec_codec: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 18/23] ASoC: rt5514-spi: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: rt5514-spi: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 19/23] ASoC: rt5677-spi: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: rt5677-spi: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 20/23] ASoC: intel: atom: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: atom: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 21/23] ASoC: intel: baytrail: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: baytrail: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` [alsa-devel] [PATCH for-5.6 22/23] ASoC: intel: haswell: Use managed buffer allocation Takashi Iwai
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: haswell: Use managed buffer allocation" to the asoc tree Mark Brown
2019-12-10 14:26 ` Takashi Iwai [this message]
2019-12-11 16:53 ` [alsa-devel] Applied "ASoC: intel: skylake: " Mark Brown
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20191210142614.19405-24-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=liam.r.girdwood@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=yang.jie@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).