Skip to content

[MTL-005] Cherry pick recent topology updates #7582

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

Merged
abonislawski merged 9 commits into from
May 19, 2023
Merged

[MTL-005] Cherry pick recent topology updates #7582

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c94b1aa
topology2: Set the deepbuffer PCM D0i3 compatibility conditionally
ranj063 Apr 25, 2023
4b995bd
Topology2: add comment to separate chromebook topology clearly
Apr 25, 2023
58cac35
Topology2: Add mtl-rt711-l0-rt1316-l23-rt714-l1 support
Apr 25, 2023
d7070d4
Tools: Topology2: SRC format fixes
ranj063 Apr 27, 2023
fdb7361
topology2: cavs-sdw: Enable PDM 1 mics for 4ch
ranj063 Mar 10, 2023
ab57ef0
topology2: cavs-nocodec: add a module copier to SSP 0 capture pipeline
ranj063 Apr 28, 2023
05c0df0
topology2: cavs-sdw: make jack optional
bardliao May 2, 2023
2506dc9
topology2: dmic-generic: add macro for DMIC_CORE_ID
yongzhi1 Apr 24, 2023
367997b
topology2: add multicore support for CI test
RanderWang Apr 25, 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
473 changes: 473 additions & 0 deletions tools/topology/topology2/cavs-nocodec-multicore.conf
View file
Open in desktop

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions tools/topology/topology2/cavs-nocodec.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ Object.Pipeline.mixout-gain-smart-amp-dai-copier-playback [
}

Object.Base.input_pin_binding.2 {
input_pin_binding_name "copier.SSP.8.1"
input_pin_binding_name "module-copier.8.1"
}

Object.Control.bytes."1" {
Expand Down Expand Up @@ -345,7 +345,9 @@ Object.Pipeline.dai-copier-gain-module-copier-capture [
out_bit_depth 32
out_valid_bit_depth 32
}
}

Object.Widget.module-copier.1 {
Object.Base.output_pin_binding.1 {
output_pin_binding_name "gain.8.1"
}
Expand Down Expand Up @@ -634,7 +636,7 @@ Object.Base.route [
}
{
source "copier.SSP.8.1"
sink "gain.8.1"
sink "module-copier.8.1"
}
{
source "copier.SSP.12.1"
Expand All @@ -661,7 +663,7 @@ Object.Base.route [
sink gain.20.1
}
{
source "copier.SSP.8.1"
source "module-copier.8.1"
sink "smart_amp.2.1"
}
]
Expand Down
162 changes: 3 additions & 159 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ Define {
SDW_JACK_IN_BE_ID 1
NUM_SDW_AMP_LINKS 0
SDW_DMIC 0
SDW_JACK true
}

# override defaults with platform-specific config
Expand All @@ -90,11 +91,6 @@ IncludeByKey.NUM_HDMIS {
"[3-4]" "platform/intel/hdmi-generic.conf"
}

# include deep buffer config if buffer size is in 1 - 1000 ms.
IncludeByKey.DEEPBUFFER_FW_DMA_MS{
"[1-1000]" "platform/intel/deep-buffer.conf"
}

IncludeByKey.NUM_SDW_AMP_LINKS {
"[1-2]" "platform/intel/sdw-amp-generic.conf"
}
Expand All @@ -103,159 +99,7 @@ IncludeByKey.SDW_DMIC {
"1" "platform/intel/sdw-dmic-generic.conf"
}

#
# List of all DAIs
#
#ALH Index: 0, Direction: duplex
Object.Dai.ALH [
{
dai_index 0
id $SDW_JACK_OUT_BE_ID
direction "playback"
name $SDW_JACK_OUT_STREAM
default_hw_conf_id 0
rate 48000
channels 2

Object.Base.hw_config.1 {
id 0
name "ALH2"
}
}
{
dai_index 10
id $SDW_JACK_IN_BE_ID
direction "capture"
name $SDW_JACK_IN_STREAM
default_hw_conf_id 1
rate 48000
channels 2

Object.Base.hw_config.1 {
id 1
name "ALH3"
}
}
]

#
# Pipeline definitions
#

# Pipeline ID:1 PCM ID: 0
Object.Pipeline {
host-copier-gain-mixin-playback [
{
index 0

Object.Widget.copier.1 {
stream_name "volume playback 0"
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '1 Playback Volume 0'
}
}
}
]

mixout-gain-dai-copier-playback [
{
index 1

Object.Widget.copier.1 {
stream_name $SDW_JACK_OUT_STREAM
dai_type "ALH"
copier_type "ALH"
node_type $ALH_LINK_OUTPUT_CLASS
}
Object.Widget.gain.1 {
Object.Control.mixer.1 {
name '2 Main Playback Volume'
}
}
}
]

host-gateway-capture [
{
index 10

Object.Widget.copier.1.stream_name "Passthrough Capture 0"
Object.Widget.copier.1.Object.Base.audio_format.1 {
# 32/32 -> 16/16 bits conversion is done here
in_bit_depth 32
in_valid_bit_depth 32
}
}
]

highpass-capture-be [
{
direction "capture"
index 11
copier_type "ALH"

Object.Widget.copier.1 {
stream_name $SDW_JACK_IN_STREAM
dai_type "ALH"
copier_type "ALH"
type "dai_out"
node_type $ALH_LINK_INPUT_CLASS
}
Object.Widget.eqiir.1 {
Object.Control.bytes."1" {
name '4 Main capture Iir Eq'
}
}
}
]
IncludeByKey.SDW_JACK {
"true" "platform/intel/sdw-jack-generic.conf"
}

Object.PCM.pcm [
{
name "Jack out"
id 0
direction "playback"
Object.Base.fe_dai.1 {
name "Jack out"
}

Object.PCM.pcm_caps.1 {
name "volume playback 0"
formats 'S16_LE,S32_LE'
}
}
{
name "Jack in"
id 1
direction "capture"
Object.Base.fe_dai.1 {
name "Jack in"
}

Object.PCM.pcm_caps.1 {
name "Passthrough Capture 0"
formats 'S16_LE,S32_LE'
}
}
]

Object.Base.route [
{
source "gain.1.1"
sink "copier.ALH.1.1"
}
{
source "mixin.0.1"
sink "mixout.1.1"
}
{
source "copier.ALH.11.1"
sink "eqiir.11.1"
}
{
source "eqiir.11.1"
sink "copier.host.10.1"
}
]
9 changes: 7 additions & 2 deletions tools/topology/topology2/development/tplg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,14 @@ PLATFORM=adl"

# SSP topology for MTL
"cavs-nocodec\;sof-mtl-nocodec\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100"
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\
DEEPBUFFER_D0I3_COMPATIBLE=true"
"cavs-nocodec\;sof-mtl-nocodec-ssp0-ssp2\;PLATFORM=mtl,NUM_DMICS=2,SSP1_ENABLED=false,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100"
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100,\
DEEPBUFFER_D0I3_COMPATIBLE=true"

"cavs-nocodec-multicore\;sof-mtl-nocodec-multicore\;PLATFORM=mtl,SSP1_ENABLED=true,SSP0_CORE_ID=0,\
SSP1_CORE_ID=1,SSP2_CORE_ID=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin"

# CAVS HDA topology with mixer-based efx eq pipelines for HDA and passthrough pipelines for HDMI
"sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
Expand Down
Loading