Rename cavs nocodec mixers #7682
Conversation
…lumes 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 in sof-tgl-nocodec.tplg: 'gain.1.1 Playback Volume 1' > 'gain.1.1 Pre Mixer Port0 Playback Volume' 'gain.2.1 Main Playback Volume 2' > 'gain.2.1 Post Mixer Port0 Playback Volume' 'gain.3.1 Playback Volume 3' > 'gain.3.1 Pre Mixer Port1 Playback Volume' 'gain.5.1 Playback Volume 5' > 'gain.5.1 Pre Mixer Port2 Playback Volume' 'gain.6.1 Main Playback Volume 6' > 'gain.6.1 Post Mixer Port2 Playback Volume' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
There was a problem hiding this comment.
@jsarha you're hitting the 44 char limit with this one right? Maybe it will be fixed when you removed the widget name from the name?
There was a problem hiding this comment.
Yes. I decided to ignore those cases that that that would be Ok without the widget name prefix. However, I am open for other suggestions for naming standard that would fit into smaller space, that would still be informative enough, and would fulfill this: https://docs.kernel.org/sound/designs/control-names.html
There was a problem hiding this comment.
is there a typo between "mix" and "mux" ? I don't recall where we used a mux and what a 'post mux volume' might be
|
@jsarha Btw, please always ensure there are enough reviewers in the PR. Add people who've edited the files recently, ask collegues, and what not. |
kv2019i
left a comment
kv2019i
left a comment
There was a problem hiding this comment.
Welcome improvement! And thanks for the good examples in git commti messages. These helped a lot when reviewing.
Coming up with the examples will be harder in the sdw and rt5682 topologies (@plbossart , they are in scope of #6576, aren't they?) as I do not have access to the HW in question? |
There was a problem hiding this comment.
is there a typo between "mix" and "mux" ? I don't recall where we used a mux and what a 'post mux volume' might be
There was a problem hiding this comment.
again where is there a MUX on DMIC capture?
There was a problem hiding this comment.
I don't understand the use of the 'mux', there's no muxing capability in our topologies @jsarha
@plbossart In the capture streams - at least in this topology - there is a single source at the DAI side that is split to multiple PCMs. To my understanding that is multiplexing (= muxing).
Rename SSP0 capture related volumes. Define a variable for PCM name and refer to it in the mixer names. Using sof-tgl-nocodec.tplg the changes are: 'gain.8.1 Host Capture Volume' > 'gain.8.1 Pre Demux Port0 Capture Volume' 'gain.7.1 Main Capture Volume 1' > 'gain.7.1 Post Demux Port0 Capture Volume' 'gain.17.1 Main Capture Volume 2' > 'gain.17.1 Post Demux ssp-capture Capture Vo' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Rename cavs-nocodec.conf DMIC0 volumes. Define variables for the associated PCM names and refer to them in the mixer names. The changes shown in sof-tgl-nocodec.tplg are: 'gain.18.1 Capture Raw Volume 1' > 'gain.18.1 Post Demux DMIC0 Raw Capture Volu' 'gain.19.1 Main Capture Volume 3' > 'gain.19.1 Pre Demux DMIC0 Raw Capture Volum' 'gain.20.1 Capture Raw Volume 2' > 'gain.20.1 Post Demux DMIC0 Raw 2 Capture Vo' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Rename SSP0 Aux Playback stream volume before mixing. Use the associated PCM name in the mixer name. This change affects nocodec topologies and appears on sof-tgl-nocodec.tplg as a following change: 'gain.21.1 Playback Volume 8' -> 'gain.21.1 Pre Mixer Port0 Aux Playback Volu' Unfortunately the new mixer name does fit into the space reserved for it, but it should get fixed once we get rid of the "gain 21.1"-prefix. Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
Rename generic DMIC mixer name. Define the associated PCM name in a common place and refer to that name on the mixer name. On cavs-tgl-nocodec.tplg is seen a following mixer name change: 'gain.13.1 DMIC0 Capture Volume 1' > 'gain.13.1 DMIC Capture Volume' Signed-off-by: Jyri Sarha <jyri.sarha@linux.intel.com>
jsarha
force-pushed
the
rename_cavs_nocodec_mixers
branch
from
e33cf5a to
b5b0f22
Compare
|
Known fails only, proceeding with merge. |
4 participants
This tries to fix the first tap in #6576 for cavs-nocodec topology.