ASoC: soc-pcm: dpcm: fix playback/capture checks#2058
ASoC: soc-pcm: dpcm: fix playback/capture checks#2058ranj063 merged 1 commit intothesofproject:topic/sof-devfrom
Conversation
plbossart
requested review from
dbaluta,
kv2019i,
lgirdwood and
ranj063
as code owners
|
Fixes #2031 |
|
@Minecrell FYI |
plbossart
force-pushed
the
fix/soc-new-pcm
branch
from
920a436 to
c32ff05
Compare
kv2019i
left a comment
kv2019i
left a comment
There was a problem hiding this comment.
I run out of time a bit -- it seems I'd need to study the surrounding code more to really understand whether this is ok or not.
|
|
||
| if (rtd->dai_link->dpcm_playback) { | ||
| stream = SNDRV_PCM_STREAM_PLAYBACK; | ||
| if (snd_soc_dai_stream_valid(cpu_dai, stream)) { |
There was a problem hiding this comment.
Oh, ASoC makes my head hurt again.
I don't quite get why "snd_soc_dai_stream_valid()==true" must apply for the first CPU DAI of the rtd, but for 2..N CPU DAIs, stream_valid check can fail.
There was a problem hiding this comment.
the idea was to check that ALL cpu_dais in a dailink that says it can do playack can indeed do so. So my proposal is to bail if you encounter one DAI that doesn't support playback.
There was a problem hiding this comment.
@plbossart I was thinking of following sequence:
CPU DAI #1 capture only but dai_link->dpcm_playback is set for the rtd so we go to L2923
CPU DAI #2 playback -> ok, playback set as 1
CPU DAI #3 another capture DAI -> as playback was set, we will return error that "CPU DAI #3 does not support playback"
... I guess this is not a case that can practically happen. If you think this is ok, I'm ok as well.
There was a problem hiding this comment.
no, you're right this doesn't work in all cases.
Maybe the correct thing to do is just increment a counter for valid dais, and check after the look that they are all valid.
There was a problem hiding this comment.
@kv2019i this check is good to catch human errors with the dai drv array declaration in the driver.
Recent changes in the ASoC core prevent multi-cpu BE dailinks from being used. DPCM does support multi-cpu DAIs for BE Dailinks, but not for FE. Handle the FE checks first, and make sure all DAIs support the same capabilities within the same dailink. BugLink: thesofproject#2031 Fixes: 9b5db05 ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported") Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
plbossart
force-pushed
the
fix/soc-new-pcm
branch
from
c32ff05 to
8f9cf9c
Compare
6 participants
Recent changes in the ASoC core prevent multi-cpu BE dailinks from
being used. DPCM does support multi-cpu DAIs for BE Dailinks, but not
for FE.
Handle the FE checks first, and make sure all DAIs support the same
capabilities within the same dailink.
BugLink: #2031
Fixes: 9b5db05 ("ASoC: soc-pcm: dpcm: Only allow playback/capture if supported")
Signed-off-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com