Alsa-Devel Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Lars-Peter Clausen <lars@metafoo.de>
To: Mark Brown <broonie@kernel.org>, Liam Girdwood <lgirdwood@gmail.com>
Cc: Ola Lilja <ola.o.lilja@stericsson.com>,
	alsa-devel@alsa-project.org,
	Rajeev Kumar <rajeev-dlh.kumar@st.com>,
	Russell King <linux@arm.linux.org.uk>,
	Ryan Mallon <rmallon@gmail.com>,
	Stephen Warren <swarren@wwwdotorg.org>,
	Vinod Koul <vinod.koul@intel.com>,
	Peter Ujfalusi <peter.ujfalusi@ti.com>,
	Hartley Sweeten <hsweeten@visionengravers.com>,
	Laxman Dewangan <ldewangan@nvidia.com>,
	Sebastien Guiriec <s-guiriec@ti.com>,
	Markus Pargmann <mpa@pengutronix.de>,
	Shawn Guo <shawn.guo@linaro.org>,
	Lee Jones <lee.jones@linaro.org>,
	Lars-Peter Clausen <lars@metafoo.de>,
	Jarkko Nikula <jarkko.nikula@bitmer.com>
Subject: [PATCH 08/17] ASoC: dmaengine-pcm: Add support for platforms which can't report residue
Date: Mon, 15 Apr 2013 19:19:55 +0200	[thread overview]
Message-ID: <1366046404-8759-9-git-send-email-lars@metafoo.de> (raw)
In-Reply-To: <1366046404-8759-1-git-send-email-lars@metafoo.de>

Unfortunately there are still quite a few platforms with a dmaengine driver
which do not support reporting the number of bytes left to transfer. If we want
to support these platforms in the generic dmaengine PCM driver we have.

Signed-off-by: Lars-Peter Clausen <lars@metafoo.de>
---
 include/sound/dmaengine_pcm.h         |  5 +++++
 sound/soc/soc-generic-dmaengine-pcm.c | 23 ++++++++++++++++++++++-
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/include/sound/dmaengine_pcm.h b/include/sound/dmaengine_pcm.h
index 1a7897a..e705286 100644
--- a/include/sound/dmaengine_pcm.h
+++ b/include/sound/dmaengine_pcm.h
@@ -86,6 +86,11 @@ void snd_dmaengine_pcm_set_config_from_dai_data(
  * makes sense if SND_DMAENGINE_PCM_FLAG_COMPAT is set as well.
  */
 #define SND_DMAENGINE_PCM_FLAG_NO_DT BIT(1)
+/*
+ * The platforms dmaengine driver does not support reporting the ammount of
+ * bytes that are still left to transfer.
+ */
+#define SND_DMAENGINE_PCM_FLAG_NO_RESIDUE BIT(2)
 
 /**
  * struct snd_dmaengine_pcm_config - Configuration data for dmaengine based PCM
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index d6e6380..ae0c37e 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -193,6 +193,23 @@ static const struct snd_soc_platform_driver dmaengine_pcm_platform = {
 	.probe_order	= SND_SOC_COMP_ORDER_LATE,
 };
 
+static const struct snd_pcm_ops dmaengine_no_residue_pcm_ops = {
+	.open		= dmaengine_pcm_open,
+	.close		= snd_dmaengine_pcm_close,
+	.ioctl		= snd_pcm_lib_ioctl,
+	.hw_params	= dmaengine_pcm_hw_params,
+	.hw_free	= snd_pcm_lib_free_pages,
+	.trigger	= snd_dmaengine_pcm_trigger,
+	.pointer	= snd_dmaengine_pcm_pointer_no_residue,
+};
+
+static const struct snd_soc_platform_driver dmaengine_no_residue_pcm_platform = {
+	.ops		= &dmaengine_no_residue_pcm_ops,
+	.pcm_new	= dmaengine_pcm_new,
+	.pcm_free	= dmaengine_pcm_free,
+	.probe_order	= SND_SOC_COMP_ORDER_LATE,
+};
+
 static const char * const dmaengine_pcm_dma_channel_names[] = {
 	[SNDRV_PCM_STREAM_PLAYBACK] = "tx",
 	[SNDRV_PCM_STREAM_CAPTURE] = "rx",
@@ -226,7 +243,11 @@ int snd_dmaengine_pcm_register(struct device *dev,
 		}
 	}
 
-	return snd_soc_add_platform(dev, &pcm->platform,
+	if (flags & SND_DMAENGINE_PCM_FLAG_NO_RESIDUE)
+		return snd_soc_add_platform(dev, &pcm->platform,
+				&dmaengine_no_residue_pcm_platform);
+	else
+		return snd_soc_add_platform(dev, &pcm->platform,
 				&dmaengine_pcm_platform);
 }
 EXPORT_SYMBOL_GPL(snd_dmaengine_pcm_register);
-- 
1.8.0

  parent reply	other threads:[~2013-04-15 17:21 UTC|newest]

Thread overview: 51+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-15 17:19 [PATCH 00/17] ASoC: Towards a generic dmaengine PCM driver Lars-Peter Clausen
2013-04-15 17:19 ` [PATCH 01/17] ASoC: dmaengine-pcm: Make requesting the DMA channel at PCM open optional Lars-Peter Clausen
     [not found]   ` <516C8D1B.3070901@gmail.com>
2013-04-16  5:33     ` Lars-Peter Clausen
2013-04-17 13:19   ` Mark Brown
2013-04-15 17:19 ` [PATCH 02/17] ASoC: Add snd_soc_{add, remove}_platform Lars-Peter Clausen
2013-04-17 13:18   ` Mark Brown
2013-04-17 13:20   ` Mark Brown
2013-04-15 17:19 ` [PATCH 03/17] ASoC: Add a generic dmaengine_pcm driver Lars-Peter Clausen
2013-04-15 23:15   ` Stephen Warren
2013-04-16  5:31     ` Lars-Peter Clausen
2013-04-16 20:02       ` Stephen Warren
2013-04-16 14:11   ` Markus Pargmann
2013-04-16 14:35     ` Lee Jones
2013-04-16 14:42       ` Markus Pargmann
2013-04-16 14:55         ` Lee Jones
2013-04-16 15:46       ` Lars-Peter Clausen
2013-04-17  9:48   ` Peter Ujfalusi
2013-04-17 10:48     ` Lars-Peter Clausen
2013-04-17 13:06       ` Peter Ujfalusi
2013-04-17 18:45         ` Lars-Peter Clausen
2013-04-18  7:30           ` Peter Ujfalusi
2013-04-17 13:21   ` Mark Brown
2013-04-15 17:19 ` [PATCH 04/17] ASoC: dmaengine_pcm: Add support for compat platforms Lars-Peter Clausen
2013-04-17 13:21   ` Mark Brown
2013-04-15 17:19 ` [PATCH 05/17] ASoC: tegra: Use generic dmaengine PCM Lars-Peter Clausen
2013-04-17 13:25   ` Mark Brown
2013-04-15 17:19 ` [PATCH 06/17] ASoC: spear: Setup dma data in DAI probe Lars-Peter Clausen
2013-04-15 17:19 ` [PATCH 07/17] ASoC: spear: Use generic dmaengine PCM Lars-Peter Clausen
2013-04-15 17:19 ` Lars-Peter Clausen [this message]
2013-04-15 17:19 ` [PATCH 09/17] ASoC: mxs: Setup dma data in DAI probe Lars-Peter Clausen
2013-04-15 17:19 ` [PATCH 10/17] ASoC: mxs: Use generic dmaengine PCM Lars-Peter Clausen
2013-04-17  8:43   ` Shawn Guo
2013-04-17  9:28     ` Lars-Peter Clausen
2013-04-17 13:50       ` Shawn Guo
2013-04-18  9:04         ` Lars-Peter Clausen
2013-04-18 15:00           ` Shawn Guo
2013-04-18 15:04             ` Lars-Peter Clausen
2013-04-18 17:46               ` Lars-Peter Clausen
2013-04-18  2:44     ` Shawn Guo
2013-04-15 17:19 ` [PATCH 11/17] ASoC: imx: Setup dma data in DAI probe Lars-Peter Clausen
2013-04-15 17:19 ` [PATCH 12/17] ASoC: imx: Use generic dmaengine PCM Lars-Peter Clausen
2013-04-15 17:20 ` [PATCH 13/17] ASoC: omap: Setup dma data in DAI probe Lars-Peter Clausen
2013-04-15 17:20 ` [PATCH 14/17] ASoC: omap: Use generic dmaengine PCM Lars-Peter Clausen
2013-04-15 17:20 ` [PATCH 15/17] ASoC: ep93xx: Setup dma data in DAI probe Lars-Peter Clausen
2013-04-15 17:20 ` [PATCH 16/17] ASoC: ep93xx: Use generic dmaengine PCM Lars-Peter Clausen
     [not found]   ` <516C91E5.9080309@gmail.com>
2013-04-16  5:32     ` Lars-Peter Clausen
2013-04-15 17:20 ` [PATCH 17/17] ASoC: ux500: " Lars-Peter Clausen
2013-04-18 13:50   ` Lee Jones
2013-04-18 14:05   ` Mark Brown
2013-04-16 15:33 ` [PATCH 00/17] ASoC: Towards a generic dmaengine PCM driver Mark Brown
2013-04-17  8:14 ` Shawn Guo

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=1366046404-8759-9-git-send-email-lars@metafoo.de \
    --to=lars@metafoo.de \
    --cc=alsa-devel@alsa-project.org \
    --cc=broonie@kernel.org \
    --cc=hsweeten@visionengravers.com \
    --cc=jarkko.nikula@bitmer.com \
    --cc=ldewangan@nvidia.com \
    --cc=lee.jones@linaro.org \
    --cc=lgirdwood@gmail.com \
    --cc=linux@arm.linux.org.uk \
    --cc=mpa@pengutronix.de \
    --cc=ola.o.lilja@stericsson.com \
    --cc=peter.ujfalusi@ti.com \
    --cc=rajeev-dlh.kumar@st.com \
    --cc=rmallon@gmail.com \
    --cc=s-guiriec@ti.com \
    --cc=shawn.guo@linaro.org \
    --cc=swarren@wwwdotorg.org \
    --cc=vinod.koul@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