From: Takashi Iwai <tiwai@suse.de>
To: alsa-devel@alsa-project.org
Cc: Cezary Rojewski <cezary.rojewski@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>,
Liam Girdwood <liam.r.girdwood@linux.intel.com>,
Mark Brown <broonie@kernel.org>,
Curtis Malainey <cujomalainey@chromium.org>,
Bard Liao <yung-chuan.liao@linux.intel.com>
Subject: [alsa-devel] [PATCH 2/8] ASoC: rt5514-spi: Convert to the common vmalloc memalloc
Date: Fri, 8 Nov 2019 10:46:35 +0100 [thread overview]
Message-ID: <20191108094641.20086-3-tiwai@suse.de> (raw)
In-Reply-To: <20191108094641.20086-1-tiwai@suse.de>
The recent change (*) in the ALSA memalloc core allows us to drop the
special vmalloc-specific allocation and page handling. This patch
coverts to the common code.
(*) 1fe7f397cfe2: ALSA: memalloc: Add vmalloc buffer allocation
support
7e8edae39fd1: ALSA: pcm: Handle special page mapping in the
default mmap handler
Since it requires the specific buffer type (SNDRV_DMA_TYPE_VMALLOC),
it's set in the pcm_new ops now.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
sound/soc/codecs/rt5514-spi.c | 21 +++++++++++----------
1 file changed, 11 insertions(+), 10 deletions(-)
diff --git a/sound/soc/codecs/rt5514-spi.c b/sound/soc/codecs/rt5514-spi.c
index 57ff5aee452d..f1b7b947ecbd 100644
--- a/sound/soc/codecs/rt5514-spi.c
+++ b/sound/soc/codecs/rt5514-spi.c
@@ -219,8 +219,7 @@ static int rt5514_spi_hw_params(struct snd_soc_component *component,
u8 buf[8];
mutex_lock(&rt5514_dsp->dma_lock);
- ret = snd_pcm_lib_alloc_vmalloc_buffer(substream,
- params_buffer_bytes(hw_params));
+ ret = snd_pcm_lib_malloc_pages(substream, params_buffer_bytes(hw_params));
rt5514_dsp->substream = substream;
rt5514_dsp->dma_offset = 0;
@@ -246,7 +245,7 @@ static int rt5514_spi_hw_free(struct snd_soc_component *component,
cancel_delayed_work_sync(&rt5514_dsp->copy_work);
- return snd_pcm_lib_free_vmalloc_buffer(substream);
+ return snd_pcm_lib_free_pages(substream);
}
static snd_pcm_uframes_t rt5514_spi_pcm_pointer(
@@ -260,12 +259,6 @@ static snd_pcm_uframes_t rt5514_spi_pcm_pointer(
return bytes_to_frames(runtime, rt5514_dsp->dma_offset);
}
-static struct page *rt5514_spi_pcm_page(struct snd_soc_component *component,
- struct snd_pcm_substream *substream,
- unsigned long offset)
-{
- return snd_pcm_lib_get_vmalloc_page(substream, offset);
-}
static int rt5514_spi_pcm_probe(struct snd_soc_component *component)
{
@@ -298,6 +291,14 @@ static int rt5514_spi_pcm_probe(struct snd_soc_component *component)
return 0;
}
+static int rt5514_spi_pcm_new(struct snd_soc_component *component,
+ struct snd_soc_pcm_runtime *rtd)
+{
+ snd_pcm_lib_preallocate_pages_for_all(rtd->pcm, SNDRV_DMA_TYPE_VMALLOC,
+ NULL, 0, 0);
+ return 0;
+}
+
static const struct snd_soc_component_driver rt5514_spi_component = {
.name = DRV_NAME,
.probe = rt5514_spi_pcm_probe,
@@ -305,7 +306,7 @@ static const struct snd_soc_component_driver rt5514_spi_component = {
.hw_params = rt5514_spi_hw_params,
.hw_free = rt5514_spi_hw_free,
.pointer = rt5514_spi_pcm_pointer,
- .page = rt5514_spi_pcm_page,
+ .pcm_construct = rt5514_spi_pcm_new,
};
/**
--
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-11-08 9:49 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-08 9:46 [alsa-devel] [PATCH 0/8] ASoC: memalloc cleanups Takashi Iwai
2019-11-08 9:46 ` [alsa-devel] [PATCH 1/8] ASoC: Remove superfluous snd_dma_continuous_data() Takashi Iwai
2019-11-08 9:46 ` Takashi Iwai [this message]
2019-11-08 9:46 ` [alsa-devel] [PATCH 3/8] ASoC: intel: Drop superfluous snd_pcm_sgbuf_ops_page Takashi Iwai
2019-11-08 9:46 ` [alsa-devel] [PATCH 4/8] ASoC: intel: Avoid non-standard macro usage Takashi Iwai
2019-11-08 9:46 ` [alsa-devel] [PATCH 5/8] ASoC: SOF: Drop superfluous snd_pcm_sgbuf_ops_page Takashi Iwai
2019-11-08 9:46 ` [alsa-devel] [PATCH 6/8] ASoC: rt5677-spi: Convert to the common vmalloc memalloc Takashi Iwai
2019-11-08 20:36 ` Curtis Malainey
2019-11-08 9:46 ` [alsa-devel] [PATCH 7/8] ASoC: cros_ec_codec: " Takashi Iwai
2019-11-08 9:46 ` [alsa-devel] [PATCH 8/8] ALSA: pcm: Unexport snd_pcm_sgbuf_ops_page Takashi Iwai
2019-11-08 12:43 ` [alsa-devel] [PATCH 0/8] ASoC: memalloc cleanups 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=20191108094641.20086-3-tiwai@suse.de \
--to=tiwai@suse.de \
--cc=alsa-devel@alsa-project.org \
--cc=broonie@kernel.org \
--cc=cezary.rojewski@intel.com \
--cc=cujomalainey@chromium.org \
--cc=liam.r.girdwood@linux.intel.com \
--cc=pierre-louis.bossart@linux.intel.com \
--cc=yung-chuan.liao@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).