Skip to content

[Test Only] Dummy wov 4 mtl hda #7047

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 2 commits into from
Closed

[Test Only] Dummy wov 4 mtl hda #7047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb5fd58
topology2: enable WoV on mtl hda platform
libinyang Feb 7, 2023
ab69a0c
topology2: wov-detect: add name for virtual widget
libinyang Feb 7, 2023
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: 2 additions & 0 deletions tools/topology/topology2/include/components/wov.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,8 @@ Class.Widget."wov" {
#
type "effect"
num_audio_formats 1
num_sink_audio_formats 1
num_source_audio_formats 0
no_pm "true"
core_id 0
num_sink_pins 1
Expand Down
1 change: 1 addition & 0 deletions tools/topology/topology2/include/pipelines/cavs/wov-detect.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ Class.Pipeline."wov-detect" {
# to the host copier. The virtual widget does not exist in
# the firmware.
virtual."virtual.detect_sink" {
name "virtual.detect_sink"
type out_drv
}

Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/platform/intel/dmic-wov.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
Object.Pipeline {
passthrough-capture.1 {
passthrough-capture.30 {
format $FORMAT
rate 16000
rate_min 16000
Expand Down
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,\
DEEPBUFFER_FW_DMA_MS=100"

# SDW + DMIC topology with passthrough pipelines
Expand Down
16 changes: 16 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 @@ -16,6 +16,8 @@
<mixout-gain-host-copier-capture.conf>
<deepbuffer-playback.conf>
<passthrough-be.conf>
<dai-kpb-be.conf>
<wov-detect.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand All @@ -26,6 +28,8 @@
<hw_config.conf>
<manifest.conf>
<route.conf>
<kpb.conf>
<src_pin_binding.conf>
<common_definitions.conf>
<dmic-default.conf>
<hdmi-default.conf>
Expand All @@ -35,6 +39,18 @@ Define {
PLATFORM "none"
NUM_DMICS 0
USE_CHAIN_DMA "false"
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