Tools: Topology2: DMIC: Bug fix 4ch host copier channels count#9368
Merged
kv2019i merged 1 commit intothesofproject:mainfrom Aug 19, 2024
Merged
Conversation
ujfalusi
reviewed
Aug 16, 2024
This patch fixes a recently introduced bug that impacts most of 4ch DMIC topologies. The NUM_DMICS=4 controls DAI channels count, while the DMIC0_PCM_CHANNELS controls host copier channels count. In most topologies built the DMIC0_PCM_CHANNELS remained in default 2 setting if it was not explicitly set in cmake target definitions. As result the "arecord -c 4" attempt failed e.g. with common sof-hda-generic-4ch.tplg. Fixes: 8836612 ("Tools: Topology2: Add DMIC Enhanced Audio Capture development tplg") Signed-off-by: Seppo Ingalsuo <seppo.ingalsuo@linux.intel.com>
623480d to
b691d00
Compare
kv2019i
approved these changes
Aug 16, 2024
ujfalusi
approved these changes
Aug 16, 2024
Contributor
ujfalusi
left a comment
There was a problem hiding this comment.
I find this version easier to follow and be more pragmatic, thanks.
It would have been nicer if a we could be able to use a define for the define, but it is a language limitation.
Collaborator
Author
|
The jenkins failures do not look related https://sof-ci.01.org/sofpr/PR9368/build7078/devicetest/index.html |
lyakh
reviewed
Aug 19, 2024
| DMIC0_PCM_CHANNELS 2 | ||
|
|
||
| # Note: This will be redefined in dmic-generic.conf if not set from cmake | ||
| DMIC0_PCM_CHANNELS 0 |
Collaborator
There was a problem hiding this comment.
I guess a naive
DMIC0_PCM_CHANNELS NUM_DMICS
wouldn't work?
Contributor
There was a problem hiding this comment.
that was my initial proposal (#9368 (comment)) but it looks like the language does not accept it.
Collaborator
Author
There was a problem hiding this comment.
Yep, it's not possible (DMIC0_PCM_CHANNELS $NUM_DMICS).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The NUM_DMICS=4 controls DAI channels count, while recently added DMIC0_PCM_CHANNELS controls host copier channels count. But in most topologies built the DMIC0_PCM_CHANNELS remained in default 2 setting if it was not set in cmake target definitions.
As result the "arecord -c 4" attempt failed e.g. with common sof-hda-generic-4ch.tplg.
Fixes: 8836612 ("Tools: Topology2:
Add DMIC Enhanced Audio Capture development tplg")