Skip to content

Fix wov topology issue - #7182

Merged
lgirdwood merged 2 commits into
thesofproject:mainfrom
aiChaoSONG:fix_wov
Mar 2, 2023
Merged

Fix wov topology issue#7182
lgirdwood merged 2 commits into
thesofproject:mainfrom
aiChaoSONG:fix_wov

Conversation

@aiChaoSONG

@aiChaoSONGaiChaoSONG commented Feb 28, 2023

Copy link
Copy Markdown
Collaborator

Minor wov topology issues, fix them in this patch, or the wov feature doesn't work

@aiChaoSONG

aiChaoSONG commented Feb 28, 2023

Copy link
Copy Markdown
CollaboratorAuthor

@ranj063 I'd like to add a test topology sof-hda-generic-2ch-kwd.tplg after this PR, but quote your comments in #7106

why only MTL, why not TGL/ADL too?

For MTL, we have to set DMIC_DRIVER_VERSION == 3 for MTL, but it is not needed for TGL/ADL, that means we cannot have a single hda-generic topology for all three MTL/TGL/ADL platforms, but can we have two? for example, sof-mtl-hda-generic-2ch-kwd.tplg/sof-tgl-hda-generic-2ch-kwd.tplg

@juimonen

juimonen commented Feb 28, 2023

Copy link
Copy Markdown

@aiChaoSONG not sure could we have the default driver_version behind platform conditionals in include/dais/dmic.conf?

@aiChaoSONG

aiChaoSONG commented Mar 1, 2023

Copy link
Copy Markdown
CollaboratorAuthor

@aiChaoSONG not sure could we have the default driver_version behind platform conditionals in include/dais/dmic.conf?

The problem is that in a single topology binary, we can only have a single driver_version, which can not support MTL/TGL simultaneously.

Chao Song added 2 commits March 1, 2023 10:29
Chao Song
topology2: fix wov issue introduced by using array
2f10fc7
Some minor issues introduced by using topology2 array,
fix them in this patch.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
Chao Song
topology2: wov-detect: correct use of define variables
a38ec23
To refer to a define variable, we should use
"$DEFINE_VAR_NAME". The $ symbol is required.
Signed-off-by: Chao Song <chao.song@linux.intel.com>
@lgirdwood

lgirdwood commented Mar 1, 2023

Copy link
Copy Markdown
Member

@RanderWang pls review

@lgirdwood
lgirdwood merged commit 1f4bc9f into thesofproject:mainMar 2, 2023
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ranj063ranj063ranj063 approved these changes
@lgirdwoodlgirdwoodlgirdwood approved these changes
@jsarhajsarhaAwaiting requested review from jsarhajsarha is a code owner

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@aiChaoSONG@juimonen@lgirdwood@ranj063