Current soc_get_playback_capture() (A) is checking playback/capture
availability for DPCM (X) / Normal (Y) / Codec2Codec (Z) connections.
(A) static int soc_get_playback_capture(...)
{
...
^ if (dai_link->dynamic || dai_link->no_pcm) {
| ...
|(a) if (dai_link->dpcm_playback) {
| ...
| ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|(*) ...
| v }
| ...
(X) }
|(b) if (dai_link->dpcm_capture) {
| ...
| ^ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
|(*) ...
| v }
| ...
v }
} else {
^ ^ /* Adapt stream for codec2codec links */
|(Z) int cpu_capture = ...
| v int cpu_playback = ...
(Y)
| ^ for_each_rtd_codec_dais(rtd, i, codec_dai) {
|(*) ...
v v }
}
...
}
(*) part is checking each DAI's availability.
At first, (X) part is for DPCM, and it checks playback/capture
availability if dai_link has dpcm_playback/capture flag (a)(b).
But we are already using playback/capture_only flag.
for Normal (Y) and Codec2Codec (Z). We can use this flags for DPCM too.
Before After
dpcm_playback = 1; => /* no flags */
dpcm_capture = 1;
dpcm_playback = 1; => playback_only = 1;
dpcm_capture = 1; => capture_only = 1;
This patch enables both flags case, but dpcm_playback/capture flags
will be removed if all driver were switched to new playback/capture_only
flags.
Here, CPU <-> Codec relationship is like this
DPCM
[CPU/dummy]-[dummy/Codec]
^^^^ ^^^^^
Normal
[CPU/Codec]
^^^^^^^^^^^
DPCM part (X) is checking only CPU DAI, and
Normal part (Y) is checking both CPU/Codec DAI
Here, validation check on dummy DAI is always true.
We want to expand validation check to all cases,
but unfortunately DPCM BE Codec validation check will breaks
compatibility on some devices. This patch ignore it with comment.
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@xxxxxxxxxxx>
Reviewed-by: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx>
---
sound/soc/soc-pcm.c | 80 ++++++++++++++++-----------------------------
1 file changed, 28 insertions(+), 52 deletions(-)
diff --git a/sound/soc/soc-pcm.c b/sound/soc/soc-pcm.c
index 77552543dcb1..b1288553f6f6 100644
--- a/sound/soc/soc-pcm.c
+++ b/sound/soc/soc-pcm.c
@@ -2732,7 +2732,10 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
int *playback, int *capture)
{
struct snd_soc_dai_link *dai_link = rtd->dai_link;
+ struct snd_soc_dai *codec_dai;
struct snd_soc_dai *cpu_dai;
+ int cpu_capture = SNDRV_PCM_STREAM_CAPTURE;
+ int cpu_playback = SNDRV_PCM_STREAM_PLAYBACK;
int has_playback = 0;
int has_capture = 0;
int i;
@@ -2748,61 +2751,34 @@ static int soc_get_playback_capture(struct snd_soc_pcm_runtime *rtd,
return -EINVAL;
}
- if (dai_link->dynamic || dai_link->no_pcm) {
- int stream;
-
- if (dai_link->dpcm_playback) {
- stream = SNDRV_PCM_STREAM_PLAYBACK;
+ /* Adapt stream for codec2codec links */
+ if (dai_link->c2c_params) {
+ cpu_capture = SNDRV_PCM_STREAM_PLAYBACK;
+ cpu_playback = SNDRV_PCM_STREAM_CAPTURE;
+ }
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (snd_soc_dai_stream_valid(cpu_dai, stream)) {
- has_playback = 1;
- break;
- }
- }
- if (!has_playback) {
- dev_err(rtd->card->dev,
- "No CPU DAIs support playback for stream %s\n",
- dai_link->stream_name);
- return -EINVAL;
- }
- }
- if (dai_link->dpcm_capture) {
- stream = SNDRV_PCM_STREAM_CAPTURE;
+ /* REMOVE ME */
+ if (dai_link->dpcm_playback && !dai_link->dpcm_capture)
+ dai_link->playback_only = 1;
+ if (!dai_link->dpcm_playback && dai_link->dpcm_capture)
+ dai_link->capture_only = 1;
- for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
- if (snd_soc_dai_stream_valid(cpu_dai, stream)) {
- has_capture = 1;
- break;
- }
- }
+ for_each_rtd_cpu_dais(rtd, i, cpu_dai) {
+ codec_dai = asoc_rtd_to_codec(rtd, i); /* get paired codec */
- if (!has_capture) {
- dev_err(rtd->card->dev,
- "No CPU DAIs support capture for stream %s\n",
- dai_link->stream_name);
- return -EINVAL;
- }
- }
- } else {
- struct snd_soc_dai *codec_dai;
-
- /* Adapt stream for codec2codec links */
- int cpu_capture = dai_link->c2c_params ?
- SNDRV_PCM_STREAM_PLAYBACK : SNDRV_PCM_STREAM_CAPTURE;
- int cpu_playback = dai_link->c2c_params ?
- SNDRV_PCM_STREAM_CAPTURE : SNDRV_PCM_STREAM_PLAYBACK;
-
- for_each_rtd_codec_dais(rtd, i, codec_dai) {
- cpu_dai = asoc_rtd_to_cpu(rtd, i);
-
- if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK) &&
- snd_soc_dai_stream_valid(cpu_dai, cpu_playback))
- has_playback = 1;
- if (snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE) &&
- snd_soc_dai_stream_valid(cpu_dai, cpu_capture))
- has_capture = 1;
- }
+ /*
+ * FIXME
+ *
+ * DPCM BE Codec has been no checked before.
+ * It should be checked, but it breaks compatibility.
+ * It ignores BE Codec here, so far.
+ */
+ if (snd_soc_dai_stream_valid(cpu_dai, cpu_playback) &&
+ (dai_link->no_pcm || snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_PLAYBACK)))
+ has_playback = 1;
+ if (snd_soc_dai_stream_valid(cpu_dai, cpu_capture) &&
+ (dai_link->no_pcm || snd_soc_dai_stream_valid(codec_dai, SNDRV_PCM_STREAM_CAPTURE)))
+ has_capture = 1;
}
if (dai_link->playback_only)
--
2.25.1
