OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology2: hdmi: update route and pipeline index 

cavs-sdw.conf uses grouped route and pipeline id. And index 20 based is
for Speaker pcm. That will conflict with the existing hdmi1 pipeline id.
Update hdmi route and pipeline ids with the same formula to avoid the
conflict.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
This commit is contained in:
Bard Liao 2022-12-19 15:04:11 +08:00 committed by Liam Girdwood
parent ee4629baf1
commit 3b7bdaf6c0
3 changed files with 36 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/topology/topology2/platform/intel/hdmi-4th.conf
View File

@ -8,7 +8,7 @@ Object.Dai {
}
}
Object.Pipeline {
passthrough-playback.23 {
passthrough-playback.80 {
Object.Widget.pipeline.1 {
stream_name $HDMI4_PIPELINE_STREAM_NAME
}
@ -19,7 +19,7 @@ Object.Pipeline {
index $HDMI4_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.23 {
passthrough-be.81 {
direction "playback"
index $HDMI4_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
@ -48,7 +48,7 @@ Object.PCM {
}
# top-level pipeline connections
Object.Base.route.13 {
Object.Base.route.80 {
source $HDMI4_HOST_PIPELINE_SINK
sink $HDMI4_DAI_PIPELINE_SRC
}

48
tools/topology/topology2/platform/intel/hdmi-default.conf
View File

@ -4,28 +4,28 @@ Define {
HDMI2_ID 6
HDMI3_ID 7
HDMI4_ID 8
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"
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"
}

18
tools/topology/topology2/platform/intel/hdmi-generic.conf
View File

@ -22,7 +22,7 @@ Object.Dai {
}
}
Object.Pipeline {
passthrough-playback.20 {
passthrough-playback.50 {
Object.Widget.pipeline.1 {
stream_name $HDMI1_PIPELINE_STREAM_NAME
}
@ -33,7 +33,7 @@ Object.Pipeline {
index $HDMI1_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.20 {
passthrough-be.51 {
direction "playback"
index $HDMI1_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
@ -47,7 +47,7 @@ Object.Pipeline {
}
use_chain_dma $USE_CHAIN_DMA
}
passthrough-playback.21 {
passthrough-playback.60 {
Object.Widget.pipeline.1 {
stream_name $HDMI2_PIPELINE_STREAM_NAME
}
@ -58,7 +58,7 @@ Object.Pipeline {
index $HDMI2_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.21 {
passthrough-be.61 {
direction "playback"
index $HDMI2_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
@ -72,7 +72,7 @@ Object.Pipeline {
}
use_chain_dma $USE_CHAIN_DMA
}
passthrough-playback.22 {
passthrough-playback.70 {
Object.Widget.pipeline.1 {
stream_name $HDMI3_PIPELINE_STREAM_NAME
}
@ -83,7 +83,7 @@ Object.Pipeline {
index $HDMI3_HOST_PIPELINE_ID
use_chain_dma $USE_CHAIN_DMA
}
passthrough-be.22 {
passthrough-be.71 {
direction "playback"
index $HDMI3_DAI_PIPELINE_ID
Object.Widget.pipeline.1 {
@ -132,15 +132,15 @@ Object.PCM {
}
# top-level pipeline connections
Object.Base.route.10 {
Object.Base.route.50 {
source $HDMI1_HOST_PIPELINE_SINK
sink $HDMI1_DAI_PIPELINE_SRC
}
Object.Base.route.11 {
Object.Base.route.60 {
source $HDMI2_HOST_PIPELINE_SINK
sink $HDMI2_DAI_PIPELINE_SRC
}
Object.Base.route.12 {
Object.Base.route.70 {
source $HDMI3_HOST_PIPELINE_SINK
sink $HDMI3_DAI_PIPELINE_SRC
}