Topo2 more mixer name fixes #7704
Merged
Conversation
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
ranj063
approved these changes
May 30, 2023
4 tasks
kv2019i
approved these changes
May 31, 2023
Collaborator
|
One DUT unavailable in https://sof-ci.01.org/sofpr/PR7704/build8623/devicetest/index.html , otherwise looks good. @plbossart , good to go? |
Contributor
Author
|
@plbossart is this Ok as it is? Should there be some PCM name changes here too? |
Contributor
Author
|
@plbossart a gentle ping. |
added 3 commits
June 26, 2023 18:39
Rename mixin and mixout EFX Analog Playback volumes. Rewrite the names of the mixers to better reflect their position in the topology. As a result of this commit mixers are renamed in sof-hda-efx-generic.tplg as follows: 'gain.1.1 1 2nd Playback Volume' to 'gain.1.1 Pre Mixer Analog Playback Volume' and 'gain.2.1 2 Main Playback Volume' to 'gain.2.1 Post Mixer Analog Playback Volume' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Rename mixin and mixout EFX Analog Playback Eqs to follow the same naming scheme as the mixers. As a result of this commit Eqs are renamed in sof-hda-efx-generic.tplg as follows: 'eqfir.2.1 2 Main playback Fir Eq' to 'eqfir.2.1 Post Mixer Analog Playback Fir Eq' and 'eqiir.2.1 2 Main playback Iir Eq' to 'eqiir.2.1 Post Mixer Analog Playback Iir Eq' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Rename SSP0, SSP1, and SSP2 playback volumes according to PCM names they are connected to. Define the PCM names as variables so the name can be changed in a single place. This is how the change will look like: 'gain.1.1 Playback Volume 1' to 'gain.1.1 Pre Mixer Port0 Playback Volume' 'gain.14.1 Main Playback Volume 14' to 'gain.14.1 Post Mixer Port0 Playback Volume' 'gain.3.1 Playback Volume 3' to 'gain.3.1 Pre Mixer Port1 Playback Volume' 'gain.4.1 Main Playback Volume 4' to 'gain.4.1 Post Mixer Port1 Playback Volume' 'gain.5.1 Playback Volume 5' to 'gain.5.1 Pre Mixer Port2 Playback Volume' 'gain.6.1 Main Playback Volume 6' to 'gain.6.1 Post Mixer Port2 Playback Volume' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
jsarha
force-pushed
the
topo2_more_mixer_name_fixes
branch
from
07ff612 to
e1d2482
Compare
Contributor
Author
|
Just a rebase due to cavs-nocodec-multicore.conf conflict. |
plbossart
approved these changes
Jun 27, 2023
Collaborator
|
Mandatory checks passing, others are known fails we have with mainline, merging. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 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.
After this the only topology source files that do not have their mixer names fixed are cavs-rt5682.conf and cavs-sdw-src-gain-mixin.conf. One of the PRs to fix #6576