Skip to content

Revert "topology: hdmi-generic: change HDMI PCM id" #6953

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
lgirdwood wants to merge 4 commits into from
Closed

Revert "topology: hdmi-generic: change HDMI PCM id" #6953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b02ac26
Revert "topology2: move development topologies to development folder"
lgirdwood Jan 13, 2023
be4089c
Revert "topology2: set NUM_HDMIS=3 topologies"
lgirdwood Jan 13, 2023
6d487d0
Revert "topology: hdmi-generic: change HDMI PCM id"
lgirdwood Jan 13, 2023
78dc4d5
Revert "topology2: hdmi: update route and pipeline index"
lgirdwood Jan 13, 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
3 changes: 1 addition & 2 deletions tools/topology/topology2/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ add_custom_target(abi_target
DEPENDS abi.conf
)

add_dependencies(topologies2 topology2_cavs topology2_ace topology2_dev)
add_dependencies(topologies2 topology2_cavs topology2_ace)
add_subdirectory(avs-tplg)
add_subdirectory(development)
add_subdirectory(sof-ace-tplg)
14 changes: 11 additions & 3 deletions tools/topology/topology2/avs-tplg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,17 @@ SDW_SPK_STREAM=SDW2-Playback,SDW_DMIC_STREAM=SDW0-Capture"
"cavs-sdw\;sof-tgl-rt711-rt1308-4ch\;NUM_SDW_AMPS=1,NUM_DMICS=4,DMIC0_ID=3,\
DMIC1_ID=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1"

"cavs-sdw\;sof-adl-rt711-4ch\;DEEPBUFFER_FW_DMA_MS=100,NUM_DMICS=4,DMIC0_ID=2,\
DMIC1_ID=3,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,HDMI1_ID=4,HDMI2_ID=5,\
HDMI3_ID=6"
# CAVS SDW with SRC gain and mixer support
"cavs-sdw-src-gain-mixin\;cavs-sdw-src-gain-mixin"

# SDW + HDMI topology with passthrough pipelines
"cavs-sdw\;cavs-sdw-hdmi\;NUM_HDMIS=4,DEEPBUFFER_FW_DMA_MS=100"

# CAVS SSP topology for TGL
"cavs-nocodec\;sof-tgl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-tgl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100"
"cavs-nocodec\;sof-adl-nocodec\;NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-adl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100"
)

add_custom_target(topology2_cavs)
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/cavs-rt5682.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Define {
DMIC0_PCM_CAPS 'Passthrough Capture 13'
DMIC0_PIPELINE_STREAM_NAME 'copier.DMIC.14.1'
# override BE link ids
NUM_HDMIS 3
NUM_HDMIS 0
HDMI1_ID 3
HDMI2_ID 4
HDMI3_ID 5
Expand Down
2 changes: 1 addition & 1 deletion tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ IncludeByKey.NUM_DMICS {
}

Define {
NUM_HDMIS 3
NUM_HDMIS 0
}

# include HDMI config if needed.
Expand Down
49 changes: 0 additions & 49 deletions tools/topology/topology2/development/CMakeLists.txt
View file
Open in desktop

This file was deleted.

8 changes: 4 additions & 4 deletions tools/topology/topology2/platform/intel/hdmi-4th.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Object.Dai {
}
}
Object.Pipeline {
passthrough-playback.80 {
passthrough-playback.23 {
Object.Widget.pipeline.1 {
stream_name $HDMI4_PIPELINE_STREAM_NAME
}
Expand All @@ -19,7 +19,7 @@ Object.Pipeline {
index $HDMI4_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.81 {
passthrough-be.23 {
direction "playback"
index $HDMI4_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
Expand All @@ -37,7 +37,7 @@ Object.Pipeline {
Object.PCM {
pcm.8 {
name HDMI4
id $HDMI4_PCM_ID
id 8
Object.Base.fe_dai.HDMI4 {}
Object.PCM.pcm_caps.playback {
name $HDMI4_PCM_CAPS
Expand All @@ -48,7 +48,7 @@ Object.PCM {
}

# top-level pipeline connections
Object.Base.route.80 {
Object.Base.route.13 {
source $HDMI4_HOST_PIPELINE_SINK
sink $HDMI4_DAI_PIPELINE_SRC
}
52 changes: 24 additions & 28 deletions tools/topology/topology2/platform/intel/hdmi-default.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,28 @@ Define {
HDMI2_ID 6
HDMI3_ID 7
HDMI4_ID 8
HDMI1_PCM_ID 5
HDMI2_PCM_ID 6
HDMI3_PCM_ID 7
HDMI4_PCM_ID 8
HDMI1_HOST_PIPELINE_ID 50
HDMI1_DAI_PIPELINE_ID 51
HDMI2_HOST_PIPELINE_ID 60
HDMI2_DAI_PIPELINE_ID 61
HDMI3_HOST_PIPELINE_ID 70
HDMI3_DAI_PIPELINE_ID 71
HDMI4_HOST_PIPELINE_ID 80
HDMI4_DAI_PIPELINE_ID 81
HDMI1_PCM_CAPS "HDMI1 Playback"
HDMI1_PIPELINE_STREAM_NAME "HDMI1 stream"
HDMI2_PCM_CAPS "HDMI2 Playback"
HDMI2_PIPELINE_STREAM_NAME "HDMI2 stream"
HDMI3_PCM_CAPS "HDMI3 Playback"
HDMI3_PIPELINE_STREAM_NAME "HDMI3 stream"
HDMI4_PCM_CAPS "HDMI4 Playback"
HDMI4_PIPELINE_STREAM_NAME "HDMI4 stream"
HDMI1_HOST_PIPELINE_SINK "copier.host.50.1"
HDMI1_DAI_PIPELINE_SRC "copier.HDA.51.1"
HDMI2_HOST_PIPELINE_SINK "copier.host.60.1"
HDMI2_DAI_PIPELINE_SRC "copier.HDA.61.1"
HDMI3_HOST_PIPELINE_SINK "copier.host.70.1"
HDMI3_DAI_PIPELINE_SRC "copier.HDA.71.1"
HDMI4_HOST_PIPELINE_SINK "copier.host.80.1"
HDMI4_DAI_PIPELINE_SRC "copier.HDA.81.1"
HDMI1_HOST_PIPELINE_ID 20
HDMI1_DAI_PIPELINE_ID 21
HDMI2_HOST_PIPELINE_ID 22
HDMI2_DAI_PIPELINE_ID 23
HDMI3_HOST_PIPELINE_ID 24
HDMI3_DAI_PIPELINE_ID 25
HDMI4_HOST_PIPELINE_ID 26
HDMI4_DAI_PIPELINE_ID 27
HDMI1_PCM_CAPS "Passthrough Playback 20"
HDMI1_PIPELINE_STREAM_NAME "copier.HDA.21.1"
HDMI2_PCM_CAPS "Passthrough Playback 22"
HDMI2_PIPELINE_STREAM_NAME "copier.HDA.23.1"
HDMI3_PCM_CAPS "Passthrough Playback 24"
HDMI3_PIPELINE_STREAM_NAME "copier.HDA.25.1"
HDMI4_PCM_CAPS "Passthrough Playback 26"
HDMI4_PIPELINE_STREAM_NAME "copier.HDA.27.1"
HDMI1_HOST_PIPELINE_SINK "copier.host.20.1"
HDMI1_DAI_PIPELINE_SRC "copier.HDA.21.1"
HDMI2_HOST_PIPELINE_SINK "copier.host.22.1"
HDMI2_DAI_PIPELINE_SRC "copier.HDA.23.1"
HDMI3_HOST_PIPELINE_SINK "copier.host.24.1"
HDMI3_DAI_PIPELINE_SRC "copier.HDA.25.1"
HDMI4_HOST_PIPELINE_SINK "copier.host.26.1"
HDMI4_DAI_PIPELINE_SRC "copier.HDA.27.1"
}
24 changes: 12 additions & 12 deletions tools/topology/topology2/platform/intel/hdmi-generic.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Object.Dai {
}
}
Object.Pipeline {
passthrough-playback.50 {
passthrough-playback.20 {
Object.Widget.pipeline.1 {
stream_name $HDMI1_PIPELINE_STREAM_NAME
}
Expand All @@ -33,7 +33,7 @@ Object.Pipeline {
index $HDMI1_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.51 {
passthrough-be.20 {
direction "playback"
index $HDMI1_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
Expand All @@ -47,7 +47,7 @@ Object.Pipeline {
}
use_chain_dma $USE_CHAIN_DMA
}
passthrough-playback.60 {
passthrough-playback.21 {
Object.Widget.pipeline.1 {
stream_name $HDMI2_PIPELINE_STREAM_NAME
}
Expand All @@ -58,7 +58,7 @@ Object.Pipeline {
index $HDMI2_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.61 {
passthrough-be.21 {
direction "playback"
index $HDMI2_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
Expand All @@ -72,7 +72,7 @@ Object.Pipeline {
}
use_chain_dma $USE_CHAIN_DMA
}
passthrough-playback.70 {
passthrough-playback.22 {
Object.Widget.pipeline.1 {
stream_name $HDMI3_PIPELINE_STREAM_NAME
}
Expand All @@ -83,7 +83,7 @@ Object.Pipeline {
index $HDMI3_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.71 {
passthrough-be.22 {
direction "playback"
index $HDMI3_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
Expand All @@ -101,7 +101,7 @@ Object.Pipeline {
Object.PCM {
pcm.5 {
name HDMI1
id $HDMI1_PCM_ID
id 5
Object.Base.fe_dai.HDMI1 {}
Object.PCM.pcm_caps.playback {
name $HDMI1_PCM_CAPS
Expand All @@ -111,7 +111,7 @@ Object.PCM {
}
pcm.6 {
name HDMI2
id $HDMI2_PCM_ID
id 6
Object.Base.fe_dai.HDMI2 {}
Object.PCM.pcm_caps.playback {
name $HDMI2_PCM_CAPS
Expand All @@ -121,7 +121,7 @@ Object.PCM {
}
pcm.7 {
name HDMI3
id $HDMI3_PCM_ID
id 7
Object.Base.fe_dai.HDMI3 {}
Object.PCM.pcm_caps.playback {
name $HDMI3_PCM_CAPS
Expand All @@ -132,15 +132,15 @@ Object.PCM {
}

# top-level pipeline connections
Object.Base.route.50 {
Object.Base.route.10 {
source $HDMI1_HOST_PIPELINE_SINK
sink $HDMI1_DAI_PIPELINE_SRC
}
Object.Base.route.60 {
Object.Base.route.11 {
source $HDMI2_HOST_PIPELINE_SINK
sink $HDMI2_DAI_PIPELINE_SRC
}
Object.Base.route.70 {
Object.Base.route.12 {
source $HDMI3_HOST_PIPELINE_SINK
sink $HDMI3_DAI_PIPELINE_SRC
}
Expand Down
12 changes: 11 additions & 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 @@ -15,11 +15,21 @@ NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,DEEPBUFFER_FW_DMA_MS=100"
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,\
DEEPBUFFER_FW_DMA_MS=100"

# SDW topology with passthrough pipelines
"cavs-sdw\;mtl-sdw"

# SDW + HDMI topology with passthrough pipelines
"cavs-sdw\;mtl-sdw-hdmi\;NUM_HDMIS=4"

# SDW + DMIC topology with passthrough pipelines
"cavs-sdw\;sof-mtl-rt711-4ch\;NUM_DMICS=4,DMIC0_ID=2,DMIC1_ID=3,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-rt711-4ch.bin,DEEPBUFFER_FW_DMA_MS=100"

"cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
# SSP topology for MTL
"cavs-nocodec\;sof-mtl-nocodec\;PLATFORM=mtl,NUM_DMICS=2,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-nocodec.bin,DEEPBUFFER_FW_DMA_MS=100"

"cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,NUM_HDMIS=4,\
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10"
)

Expand Down
3 changes: 0 additions & 3 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 @@ -58,9 +58,6 @@ Define {
HDMI1_ID 1
HDMI2_ID 2
HDMI3_ID 3
HDMI1_PCM_ID 3
HDMI2_PCM_ID 4
HDMI3_PCM_ID 5
}

# always include HDMI config
Expand Down