Skip to content

Conversation

@juimonen
Copy link

Dmic volume and switch naming was hardcoded into capture eq pipelines,
which introduced problems when creating several instances of those
pipelines. So move the naming defines up 1 level to the topologies
using those pipelines.

Signed-off-by: Jaska Uimonen jaska.uimonen@intel.com

@juimonen juimonen changed the title topology: move volume/switch control naming to upper level [RFC] topology: move volume/switch control naming to upper level Nov 15, 2019
@zrombel
Copy link

zrombel commented Nov 28, 2019

Due to PR#2029 merge and CI bit depth conversion tests changes, this PR require rebase.

@lgirdwood
Copy link
Member

@ranj063 @juimonen any agreement on this from you guys ?

@juimonen
Copy link
Author

juimonen commented Jan 7, 2020

@ranj063 if you have time, can you still clarify what kind of changes you meant? I was not fully getting it...

@lgirdwood
Copy link
Member

@juimonen @ranj063 ping, any updates ?

@juimonen
Copy link
Author

@lgirdwood I'll check this tomorrow... @ranj063 if you have time to elaborate what was the idea in your proposal with this as I didn't quite get it...

@juimonen
Copy link
Author

@ranj063 I modified this now quite heavily, so trying to make it so that you can set explicit pga/control names from pipeline files if you wish to do so.... You think this is going to the right direction? It should be more clear now and I got rid of the messy defines etc.

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@juimonen as a quick sanity check, can you compare the ASCII conf files after M4 processing with and without this patch. This should highlight us to any issues quickly.

@juimonen
Copy link
Author

@lgirdwood yes will do. I need to rebase this also, was doing against old master...

@ranj063
Copy link
Collaborator

ranj063 commented Jan 23, 2020

@juimonen sorry for the delay. I have lost track of what I said earlier in this PR. Let me look through your changes today

@juimonen
Copy link
Author

@ranj063 hold on for a while still :) I need to resolve some issues still...

@juimonen
Copy link
Author

@ranjani ok, now should be good for review...
@lgirdwood added diff between master topologies and this PR, there's only some empty line changes and the dmic naming related to this PR.
diffi.txt

Copy link
Member

@lgirdwood lgirdwood left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@plbossart @ranj063 any comments, if not pls merge.

@juimonen
Copy link
Author

SOFCI TEST

@lgirdwood
Copy link
Member

@juimonen CI failing due to conflicts

Currently pga and related mixercontrol have widget naming schemes inside
the macro. This is done to help the person writing topologies as pga's
are automatically named by concatenating pipeline ids with hard coded
names. As pga and mixercontrol define the control name visible in
alsamixer we want to allow explicit naming outside the macro call.  For
example dmic control needs to be "Dmic0 Capture Volume" as this is
defined in UCM and used by Pulseaudio. So let the name argument in pga
and mixercontrol macros to be the widget name and don't modify it inside
the macro. There are still N_PGA and N_CONTROLMIXER macros which can be
used to generate the old style control names.

Signed-off-by: Jaska Uimonen <jaska.uimonen@intel.com>
@lgirdwood
Copy link
Member

@juimonen still conflicting ?

@juimonen
Copy link
Author

@lgirdwood yes should read the github conflict messages... now updated

@lgirdwood
Copy link
Member

SOFCI TEST

@lgirdwood lgirdwood closed this Mar 28, 2021
@lgirdwood lgirdwood deleted the branch thesofproject:master March 28, 2021 13:44
@paulstelian97
Copy link
Collaborator

Please resubmit with "main" as PR base branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants