Repository navigation
Fix topologies build with latest ALSA in stable-v1.9 - #5632
Merged
Merged
Conversation
The demux routing matrix and config are removed for two reasons: 1. the config 'demux_priv_1' is hardcoded for pipeline 1 only. 2. other m4 file with demux compoenet like pipe-volume-demux-playback has the matrix and config defined in the topology file. The topology which implement this pipeline should define the routing matrx and config named as 'demux_priv_<pipeline id>' before including this m4 file. Signed-off-by: Brent Lu <brent.lu@intel.com> (cherry picked from commit 771c2bb)
When the string fields left empty, the alsa topology parser treats SND_CONFIG_TYPE_STRING type config as -EINVAL, so set defauls values. Signed-off-by: Yong Zhi <yong.zhi@intel.com> (cherry picked from commit 47b159f)
The string parser in alsa-lib is sensitive to these now. So fix it. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> (cherry picked from commit db04155)
The recent changes to the string parser in alsa-lib cause the topology builds to break for some topologies. Avoid adding a newline for the bytes data for the MUXDEMUX config by introducing a new macro for creating lists without new lines between items. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> (cherry picked from commit 3e1c160)
Remove the extra space to make the topology build with upstream alsa-lib. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com> (cherry picked from commit fcfd5d6)
marc-hb
marked this pull request as ready for review
April 1, 2022 03:57
marc-hb
requested review from
dbaluta,
lbetlej,
lgirdwood,
mmaka1 and
plbossart
as code owners
April 1, 2022 03:57
Merged
marc-hb
added a commit
to marc-hb/sof
that referenced
this pull request
Apr 1, 2022
This removes two layers of indirection when trying to find what fails. The lack of this proved especially painful when working on thesofproject#5632 and similar backports. Also move outputs to a subdirectory by default. No change when invoked from CMake which does not use the default output directory. Also show the exact m4 and alsatplg commands run when not using XARGS parallelization. Again this is critical when something fails. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
lgirdwood
approved these changes
Apr 1, 2022
lgirdwood
pushed a commit
that referenced
this pull request
Apr 2, 2022
This removes two layers of indirection when trying to find what fails. The lack of this proved especially painful when working on #5632 and similar backports. Also move outputs to a subdirectory by default. No change when invoked from CMake which does not use the default output directory. Also show the exact m4 and alsatplg commands run when not using XARGS parallelization. Again this is critical when something fails. Signed-off-by: Marc Herbert <marc.herbert@intel.com>
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
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.
Cherry-picks with almost no conflict, just a minor conflict for 3e1c160 caused by the lack of
113a49df41010d