Skip to content

topology2: enable WoV on mtl hda platform #7106

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
libinyang wants to merge 1 commit into from
+20 −2
Closed

topology2: enable WoV on mtl hda platform #7106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rimage
Open in desktop
Submodule rimage updated 7 files
+0 −9 config/mtl.toml
+0 −9 config/tgl-cavs.toml
+0 −8 config/tgl-h-cavs.toml
+13 −61 src/adsp_config.c
+2 −16 src/elf.c
+0 −4 src/include/rimage/rimage.h
+1 −6 src/include/rimage/sof/user/manifest.h
2 changes: 1 addition & 1 deletion tools/topology/topology2/sof-ace-tplg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ set(TPLGS
HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,DEEPBUFFER_FW_DMA_MS=100"
"sof-hda-generic\;sof-hda-generic-2ch\;PLATFORM=mtl,\
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,\
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,INCLUDE_WOV=true,\
Copy link
Collaborator

@ranj063 ranj063 Feb 16, 2023

Choose a reason for hiding this comment

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

why only MTL, why not TGL/ADL too?

Copy link
Member

@plbossart plbossart Feb 16, 2023

Choose a reason for hiding this comment

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

That's a no for me. These topologies will be released externally, no way we are going to add a pretend WOV that makes no sense.

if you want to add WOV for tests, then that has to be done in a development topology or a CI one.

Copy link
Contributor Author

@libinyang libinyang Feb 17, 2023

Choose a reason for hiding this comment

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

That's a no for me. These topologies will be released externally, no way we are going to add a pretend WOV that makes no sense.

if you want to add WOV for tests, then that has to be done in a development topology or a CI one.

@plbossart I forgot to add "Draft" on it. This is not a final solution, but a reference code. The final solution is, as Liam suggested in #7047 (review), that we will create a test tplg for it. Sorry for the inconvenience.

Copy link
Member

@plbossart plbossart Feb 17, 2023

Choose a reason for hiding this comment

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

what you want is to extend a topology for tests not create a new one. We've done this already with deep-buffer that are not released, etc.

DEEPBUFFER_FW_DMA_MS=100"

# SDW + DMIC topology with passthrough pipelines
Expand Down
18 changes: 18 additions & 0 deletions tools/topology/topology2/sof-hda-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
<gain-capture.conf>
<deepbuffer-playback.conf>
<passthrough-be.conf>
<dai-kpb-be.conf>
<wov-detect.conf>
<passthrough-capture-be.conf>
<data.conf>
<pcm.conf>
Expand All @@ -30,6 +32,10 @@
<hw_config.conf>
<manifest.conf>
<route.conf>
<output_pin_binding.conf>
<kpb.conf>
<input_audio_format.conf>
<output_audio_format.conf>
<common_definitions.conf>
<dmic-default.conf>
<hdmi-default.conf>
Expand All @@ -45,6 +51,18 @@ Define {
DMIC0_DAI_COPIER 'copier.DMIC.12.1'
DMIC0_DAI_GAIN 'gain.12.1'
DMIC0_PCM_CAPS 'Gain Capture 11'
DMIC1_PCM_CAPS 'DMIC1 WOV Capture'
DMIC1_HOST_PIPELINE_ID 16
DMIC1_DAI_PIPELINE_ID 17
WOV_PIPELINE_ID 18
DMIC1_HOST_PIPELINE_SINK 'copier.host.16.1'
DMIC_WOV_DAI_PIPELINE_SRC 'copier.DMIC.17.1'
DMIC_WOV_DAI_PIPELINE_KPB 'kpb.17.1'
WOV_PIPELINE_SINK 'micsel.18.1'
WOV_PIPELINE_VIRTUAL 'virtual.detect_sink'
WOV_CPC '360000'
DMIC1_PCM_CAPS 'DMIC1 WOV Capture'
DMIC1_PIPELINE_STREAM_NAME 'copier.DMIC.17.1'
}

# override defaults with platform-specific config
Expand Down