Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
Hi Mark, On Fri, Dec 6, 2013 at 4:57 PM, Mark Brown broo...@kernel.org wrote: On Fri, Dec 06, 2013 at 10:44:33AM +0530, Padma Venkat wrote: This is done in your earlier patch ASoC: samsung: Ensure DMA data is initialised for secondary DAI . Was it done on purpose or by mistake in this patch? It's intentional - notice that the function has changed, this is why I kept asking you about mainline. Mainline doesn't have the wrapper function that abstracts the difference between s3c-dma and dmaengine, this is why I'm saying these two will need to be rebased on top of the mainline fix. Ok. I didn't notice the function name. Then this commit is not required in the mainline. This is required only after your changes because in dmaengine we are requesting the dma channel statically but in mainline(with samsung proprietary ops) we are requesting the dma channel at run time during playback or capture. I think you also told to include a patch for reinitialization of the dma_data in i2s_hw_params. If you are in the process of debugging some bug as you mentioned earlier you can ignore this comment. Otherwise it is just a reminder. Hrm, forgot to commit that bit. Thanks Padma -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
Hi Mark, On Mon, Dec 9, 2013 at 5:30 PM, Padma Venkat padma@gmail.com wrote: Hi Mark, On Fri, Dec 6, 2013 at 4:57 PM, Mark Brown broo...@kernel.org wrote: On Fri, Dec 06, 2013 at 10:44:33AM +0530, Padma Venkat wrote: This is done in your earlier patch ASoC: samsung: Ensure DMA data is initialised for secondary DAI . Was it done on purpose or by mistake in this patch? It's intentional - notice that the function has changed, this is why I kept asking you about mainline. Mainline doesn't have the wrapper function that abstracts the difference between s3c-dma and dmaengine, this is why I'm saying these two will need to be rebased on top of the mainline fix. Ok. I didn't notice the function name. Then this commit is not required in the mainline. This is required only after your changes because in dmaengine we are requesting the dma channel statically but in mainline(with samsung proprietary ops) we are requesting the dma channel at run time during playback or capture. sorry for the mix-up. I think we need to set the dma data for the secondary dai even in mainline. I think you also told to include a patch for reinitialization of the dma_data in i2s_hw_params. If you are in the process of debugging some bug as you mentioned earlier you can ignore this comment. Otherwise it is just a reminder. Hrm, forgot to commit that bit. Thanks Padma -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
On Mon, Dec 09, 2013 at 05:30:47PM +0530, Padma Venkat wrote: This is required only after your changes because in dmaengine we are requesting the dma channel statically but in mainline(with samsung proprietary ops) we are requesting the dma channel at run time during playback or capture. OK, so it does get set somewhere but not here? signature.asc Description: Digital signature
Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
On Fri, Dec 06, 2013 at 10:44:33AM +0530, Padma Venkat wrote: This is done in your earlier patch ASoC: samsung: Ensure DMA data is initialised for secondary DAI . Was it done on purpose or by mistake in this patch? It's intentional - notice that the function has changed, this is why I kept asking you about mainline. Mainline doesn't have the wrapper function that abstracts the difference between s3c-dma and dmaengine, this is why I'm saying these two will need to be rebased on top of the mainline fix. I think you also told to include a patch for reinitialization of the dma_data in i2s_hw_params. If you are in the process of debugging some bug as you mentioned earlier you can ignore this comment. Otherwise it is just a reminder. Hrm, forgot to commit that bit. signature.asc Description: Digital signature
Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
Hi Mark,
On Thu, Dec 5, 2013 at 7:55 PM, Mark Brown broo...@kernel.org wrote:
From: Mark Brown broo...@linaro.org
In preparation for using the dmaengine helpers in ASoC rather than the
dmaengine wrappers for the Samsung API wrap the configuration of dma_data.
The dmaengine code expects different data to that used by the legacy API.
Signed-off-by: Mark Brown broo...@linaro.org
---
This will need merging with the fix patch I sent earlier, I'l do that
assuming this is OK.
[snip]
diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c
index a5cbdb4f1655..eab0050d4579 100644
--- a/sound/soc/samsung/i2s.c
+++ b/sound/soc/samsung/i2s.c
@@ -946,8 +946,11 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai)
struct i2s_dai *i2s = to_info(dai);
struct i2s_dai *other = i2s-pri_dai ? : i2s-sec_dai;
- if (other other-clk) /* If this is probe on secondary */
+ if (other other-clk) { /* If this is probe on secondary */
+ samsung_asoc_init_dma_data(dai, other-sec_dai-dma_playback,
+ NULL);
goto probe_exit;
+ }
This is done in your earlier patch ASoC: samsung: Ensure DMA data is
initialised for secondary DAI . Was it done on purpose or by mistake
in this patch?
I think you also told to include a patch for reinitialization of the
dma_data in i2s_hw_params. If you are in the process of debugging some
bug as you mentioned earlier you can ignore this comment. Otherwise it
is just a reminder.
Thanks
Padma
--
To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
On Tue, Nov 26, 2013 at 10:54:57AM +0530, Padma Venkat wrote: - snd_soc_dai_init_dma_data(dai, i2s-dma_playback, i2s-dma_capture); + samsung_asoc_init_dma_data(dai, i2s-dma_playback, i2s-dma_capture); we have to initialize the dma data for i2s secondary dai also otherwise there is a crash in dmaengine_pcm_new during probe. This should be called when both DAIs are probed... in any case, if this is broken presumably the driver is already broken given that this is just a substitution? I've no systems capable of actually running audio with the later DAIs. signature.asc Description: Digital signature
Re: [alsa-devel] [PATCH 1/2] ASoC: samsung: Provide helper for DMA init
Hi Mark, On Tue, Nov 12, 2013 at 7:18 PM, Mark Brown broo...@kernel.org wrote: From: Mark Brown broo...@linaro.org In preparation for using the dmaengine helpers in ASoC rather than the dmaengine wrappers for the Samsung API wrap the configuration of dma_data. The dmaengine code expects different data to that used by the legacy API. Signed-off-by: Mark Brown broo...@linaro.org --- sound/soc/samsung/ac97.c | 51 +++- sound/soc/samsung/dma.c | 8 sound/soc/samsung/dma.h | 3 +++ sound/soc/samsung/i2s.c | 2 +- sound/soc/samsung/pcm.c | 18 + 5 files changed, 38 insertions(+), 44 deletions(-) [snip] diff --git a/sound/soc/samsung/i2s.c b/sound/soc/samsung/i2s.c index a5cbdb4..67d9fa9 100644 --- a/sound/soc/samsung/i2s.c +++ b/sound/soc/samsung/i2s.c @@ -963,7 +963,7 @@ static int samsung_i2s_dai_probe(struct snd_soc_dai *dai) } clk_prepare_enable(i2s-clk); - snd_soc_dai_init_dma_data(dai, i2s-dma_playback, i2s-dma_capture); + samsung_asoc_init_dma_data(dai, i2s-dma_playback, i2s-dma_capture); we have to initialize the dma data for i2s secondary dai also otherwise there is a crash in dmaengine_pcm_new during probe. Thanks Padma -- To unsubscribe from this list: send the line unsubscribe linux-samsung-soc in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
