* [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
@ 2013-10-19 20:38 Mark Brown
2013-10-21 1:03 ` Shawn Guo
2013-10-22 11:30 ` Lars-Peter Clausen
0 siblings, 2 replies; 6+ messages in thread
From: Mark Brown @ 2013-10-19 20:38 UTC (permalink / raw)
To: Liam Girdwood, Shawn Guo, Lars-Peter Clausen
Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
When using the legacy filter function channel requests we currently pass
the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
be helpful for actual filtering. Since there's already a field in the
structure called filter_data clearly intended for use here convert the
driver to use that.
All existing users of plain filter functions have been converted to use
an explict compat function to override this behaviour except i.MX which
is working around this issue in its filter function and is updated to
just use filter_data directly here.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/fsl/imx-pcm-dma.c | 4 +---
sound/soc/soc-generic-dmaengine-pcm.c | 5 ++++-
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
index 4dc1296..aee2307 100644
--- a/sound/soc/fsl/imx-pcm-dma.c
+++ b/sound/soc/fsl/imx-pcm-dma.c
@@ -25,12 +25,10 @@
static bool filter(struct dma_chan *chan, void *param)
{
- struct snd_dmaengine_dai_dma_data *dma_data = param;
-
if (!imx_dma_is_general_purpose(chan))
return false;
- chan->private = dma_data->filter_data;
+ chan->private = param;
return true;
}
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index e29ec3c..17dd379 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -126,6 +126,9 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
struct snd_pcm_substream *substream)
{
struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+ struct snd_dmaengine_dai_dma_data *dma_data;
+
+ dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
return pcm->chan[0];
@@ -134,7 +137,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
return pcm->config->compat_request_channel(rtd, substream);
return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,
- snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
+ dma_data->filter_data);
}
static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
2013-10-19 20:38 [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests Mark Brown
@ 2013-10-21 1:03 ` Shawn Guo
2013-10-22 11:30 ` Lars-Peter Clausen
1 sibling, 0 replies; 6+ messages in thread
From: Shawn Guo @ 2013-10-21 1:03 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Lars-Peter Clausen, Liam Girdwood, linaro-kernel, Mark Brown
On Sat, Oct 19, 2013 at 09:38:26PM +0100, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> When using the legacy filter function channel requests we currently pass
> the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
> be helpful for actual filtering. Since there's already a field in the
> structure called filter_data clearly intended for use here convert the
> driver to use that.
>
> All existing users of plain filter functions have been converted to use
> an explict compat function to override this behaviour except i.MX which
> is working around this issue in its filter function and is updated to
> just use filter_data directly here.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
Tested-by: Shawn Guo <shawn.guo@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
2013-10-19 20:38 [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests Mark Brown
2013-10-21 1:03 ` Shawn Guo
@ 2013-10-22 11:30 ` Lars-Peter Clausen
1 sibling, 0 replies; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-10-22 11:30 UTC (permalink / raw)
To: Mark Brown
Cc: alsa-devel, Shawn Guo, Liam Girdwood, linaro-kernel, Mark Brown
On 10/19/2013 10:38 PM, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> When using the legacy filter function channel requests we currently pass
> the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
> be helpful for actual filtering. Since there's already a field in the
> structure called filter_data clearly intended for use here convert the
> driver to use that.
>
> All existing users of plain filter functions have been converted to use
> an explict compat function to override this behaviour except i.MX which
typo: explicit
> is working around this issue in its filter function and is updated to
> just use filter_data directly here.
>
> Signed-off-by: Mark Brown <broonie@linaro.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
> ---
> sound/soc/fsl/imx-pcm-dma.c | 4 +---
> sound/soc/soc-generic-dmaengine-pcm.c | 5 ++++-
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/sound/soc/fsl/imx-pcm-dma.c b/sound/soc/fsl/imx-pcm-dma.c
> index 4dc1296..aee2307 100644
> --- a/sound/soc/fsl/imx-pcm-dma.c
> +++ b/sound/soc/fsl/imx-pcm-dma.c
> @@ -25,12 +25,10 @@
>
> static bool filter(struct dma_chan *chan, void *param)
> {
> - struct snd_dmaengine_dai_dma_data *dma_data = param;
> -
> if (!imx_dma_is_general_purpose(chan))
> return false;
>
> - chan->private = dma_data->filter_data;
> + chan->private = param;
>
> return true;
> }
> diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
> index e29ec3c..17dd379 100644
> --- a/sound/soc/soc-generic-dmaengine-pcm.c
> +++ b/sound/soc/soc-generic-dmaengine-pcm.c
> @@ -126,6 +126,9 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
> struct snd_pcm_substream *substream)
> {
> struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
> + struct snd_dmaengine_dai_dma_data *dma_data;
> +
> + dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
>
> if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
> return pcm->chan[0];
> @@ -134,7 +137,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
> return pcm->config->compat_request_channel(rtd, substream);
>
> return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,
> - snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
> + dma_data->filter_data);
> }
>
> static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
2013-10-19 17:22 ` Lars-Peter Clausen
@ 2013-10-19 20:01 ` Mark Brown
0 siblings, 0 replies; 6+ messages in thread
From: Mark Brown @ 2013-10-19 20:01 UTC (permalink / raw)
To: Lars-Peter Clausen; +Cc: alsa-devel, linaro-kernel, Liam Girdwood
[-- Attachment #1.1: Type: text/plain, Size: 207 bytes --]
On Sat, Oct 19, 2013 at 07:22:17PM +0200, Lars-Peter Clausen wrote:
> I think this patch also needs to update sound/soc/fsl/imx-pcm-dma.c
Yes, I sent a patch for that I think? Or did I forget to post it?
[-- Attachment #1.2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
[-- Attachment #2: Type: text/plain, Size: 0 bytes --]
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
2013-10-19 13:35 Mark Brown
@ 2013-10-19 17:22 ` Lars-Peter Clausen
2013-10-19 20:01 ` Mark Brown
0 siblings, 1 reply; 6+ messages in thread
From: Lars-Peter Clausen @ 2013-10-19 17:22 UTC (permalink / raw)
To: Mark Brown; +Cc: alsa-devel, linaro-kernel, Liam Girdwood, Mark Brown
On 10/19/2013 03:35 PM, Mark Brown wrote:
> From: Mark Brown <broonie@linaro.org>
>
> When using the legacy filter function channel requests we currently pass
> the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
> be helpful for actual filtering. Since there's already a field in the
> structure called filter_data clearly intended for use here convert the
> driver to use that.
>
> All existing users of plain filter functions have been converted to use
> an explict compat function to override this behaviour.
I think this patch also needs to update sound/soc/fsl/imx-pcm-dma.c
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests
@ 2013-10-19 13:35 Mark Brown
2013-10-19 17:22 ` Lars-Peter Clausen
0 siblings, 1 reply; 6+ messages in thread
From: Mark Brown @ 2013-10-19 13:35 UTC (permalink / raw)
To: Lars-Peter Clausen, Liam Girdwood; +Cc: alsa-devel, linaro-kernel, Mark Brown
From: Mark Brown <broonie@linaro.org>
When using the legacy filter function channel requests we currently pass
the audio specific struct snd_dmaengine_dai_dma_data which isn't likely to
be helpful for actual filtering. Since there's already a field in the
structure called filter_data clearly intended for use here convert the
driver to use that.
All existing users of plain filter functions have been converted to use
an explict compat function to override this behaviour.
Signed-off-by: Mark Brown <broonie@linaro.org>
---
sound/soc/soc-generic-dmaengine-pcm.c | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/sound/soc/soc-generic-dmaengine-pcm.c b/sound/soc/soc-generic-dmaengine-pcm.c
index 99f9495..2eea2e0 100644
--- a/sound/soc/soc-generic-dmaengine-pcm.c
+++ b/sound/soc/soc-generic-dmaengine-pcm.c
@@ -168,6 +168,9 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
struct snd_pcm_substream *substream)
{
struct dmaengine_pcm *pcm = soc_platform_to_pcm(rtd->platform);
+ struct snd_dmaengine_dai_dma_data *dma_data;
+
+ dma_data = snd_soc_dai_get_dma_data(rtd->cpu_dai, substream);
if ((pcm->flags & SND_DMAENGINE_PCM_FLAG_HALF_DUPLEX) && pcm->chan[0])
return pcm->chan[0];
@@ -176,7 +179,7 @@ static struct dma_chan *dmaengine_pcm_compat_request_channel(
return pcm->config->compat_request_channel(rtd, substream);
return snd_dmaengine_pcm_request_channel(pcm->config->compat_filter_fn,
- snd_soc_dai_get_dma_data(rtd->cpu_dai, substream));
+ dma_data->filter_data);
}
static int dmaengine_pcm_new(struct snd_soc_pcm_runtime *rtd)
--
1.8.4.rc3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2013-10-22 11:31 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-19 20:38 [PATCH] ASoC: dmaengine: Use filter_data rather than dma_data for compat requests Mark Brown
2013-10-21 1:03 ` Shawn Guo
2013-10-22 11:30 ` Lars-Peter Clausen
-- strict thread matches above, loose matches on Subject: below --
2013-10-19 13:35 Mark Brown
2013-10-19 17:22 ` Lars-Peter Clausen
2013-10-19 20:01 ` Mark Brown
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.