Skip to content

Revert "topology2: cavs: Add chained DMA support for HDMI pipelines" #6514

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
kv2019i merged 1 commit into from
Nov 2, 2022
Merged

Revert "topology2: cavs: Add chained DMA support for HDMI pipelines" #6514

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
21 changes: 8 additions & 13 deletions tools/topology/topology2/cavs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,31 +3,26 @@
# Array of "input-file-name;output-file-name;comma separated pre-processor variables"
set(TPLGS
# CAVS HDMI only topology with passthrough pipelines
"cavs-passthrough-hdmi\;cavs-passthrough-hdmi\;HDMI_CONFIG=chaindma"
"cavs-passthrough-hdmi\;cavs-passthrough-hdmi"
# CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda\;HDA_CONFIG=mix,HDMI_CONFIG=chaindma"
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda\;HDA_CONFIG=mix"
# If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the
# topologies below.
# CNL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-2ch-cnl\;\
HDA_CONFIG=mix,NUM_DMICS=2,PLATFORM=cnl,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin,\
HDMI_CONFIG=chaindma"
HDA_CONFIG=mix,NUM_DMICS=2,PLATFORM=cnl,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-4ch-cnl\;\
HDA_CONFIG=mix,NUM_DMICS=4,PLATFORM=cnl,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin,HDMI_CONFIG=chaindma"
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
# TGL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-tgl\;\
HDA_CONFIG=mix,HDMI_CONFIG=chaindma,PLATFORM=tgl"
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-2ch-tgl\;\
HDA_CONFIG=mix,NUM_DMICS=2,PLATFORM=tgl,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin,\
HDMI_CONFIG=chaindma"
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-4ch-tgl\;\
HDA_CONFIG=mix,NUM_DMICS=4,PLATFORM=tgl,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin,HDMI_CONFIG=chaindma"
HDA_CONFIG=mix,NUM_DMICS=4,PLATFORM=cnl,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt.bin"
# MTL: CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
"cavs-passthrough-hdmi\;cavs-mixin-mixout-hda-4ch-mtl\;PLATFORM=mtl,\
HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
NHLT_BIN=nhlt-mtl-hda-mix.bin,HDMI_CONFIG=chaindma"
HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-mtl-hda-mix.bin"

# CAVS SDW topology with passthrough pipelines
"cavs-sdw\;cavs-sdw"
Expand Down
9 changes: 2 additions & 7 deletions tools/topology/topology2/cavs/cavs-passthrough-hdmi.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<mixout-gain-host-copier-capture.conf>
<deepbuffer-playback.conf>
<passthrough-be.conf>
<chain-dma-playback.conf>
<data.conf>
<pcm.conf>
<pcm_caps.conf>
Expand All @@ -35,7 +34,6 @@ Define {
HDA_CONFIG "none"
PLATFORM "none"
NUM_DMICS 0
HDMI_CONFIG "generic"
}

# override defaults with platform-specific config
Expand All @@ -61,11 +59,8 @@ Define {
HDMI3_ID 3
}

# include HDMI config
IncludeByKey.HDMI_CONFIG {
"generic" "platform/intel/hdmi-generic.conf"
"chaindma" "platform/intel/hdmi-chain-dma.conf"
}
# always include HDMI config
<hdmi-generic.conf>

Object.Widget.virtual {
codec0_in {
Expand Down
33 changes: 0 additions & 33 deletions tools/topology/topology2/cavs/platform/intel/hdmi-chain-dma-4th.conf
View file
Open in desktop

This file was deleted.

94 changes: 0 additions & 94 deletions tools/topology/topology2/cavs/platform/intel/hdmi-chain-dma.conf
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion tools/topology/topology2/include/common/tokens.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ Object.Base.VendorToken {
dynamic_pipeline 206
# ABI 4.0 onwards
lp_mode 207
use_chain_dma 209
}

"sof_tkn_intel_ssp" {
Expand Down
12 changes: 0 additions & 12 deletions tools/topology/topology2/include/components/pipeline.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,18 +95,6 @@ Class.Widget."pipeline" {
}
}

# Skip setting up the pipeline in the DSP in the case of chained DMA mode
DefineAttribute."use_chain_dma" {
type "string"
token_ref "sof_tkn_scheduler.bool"
constraints {
!valid_values [
"true"
"false"
]
}
}

attributes {
# pipeline widget name will be constructed as pipeline.1, pipeline.2 etc
!constructor [
Expand Down
73 changes: 0 additions & 73 deletions tools/topology/topology2/include/pipelines/cavs/chain-dma-playback.conf
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions tools/topology/topology2/include/pipelines/pipeline-common.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,14 +79,3 @@ DefineAttribute."time_domain" {

# flag to indicate if the pipeline is dynamic
DefineAttribute."dynamic_pipeline" {}

# Skip setting up the pipeline in the DSP in the case of chained DMA mode
DefineAttribute."use_chain_dma" {
type "string"
constraints {
!valid_values [
"true"
"false"
]
}
}