From 96e443d3020f706f9a5edeb19e66b952c17f4ef5 Mon Sep 17 00:00:00 2001 From: Yong Zhi Date: Wed, 7 Feb 2024 10:32:11 -0600 Subject: [PATCH] topology2: cavs-rt5682: expose spk core_id for overriding Port from nocodec topology for multi-core validation. Signed-off-by: Yong Zhi --- tools/topology/topology2/cavs-mixin-mixout-ssp.conf | 9 +++++++++ tools/topology/topology2/cavs-rt5682.conf | 1 + tools/topology/topology2/platform/intel/deep-buffer.conf | 4 ++++ 3 files changed, 14 insertions(+) diff --git a/tools/topology/topology2/cavs-mixin-mixout-ssp.conf b/tools/topology/topology2/cavs-mixin-mixout-ssp.conf index 556cfa6f9c4f..50564ab3b291 100644 --- a/tools/topology/topology2/cavs-mixin-mixout-ssp.conf +++ b/tools/topology/topology2/cavs-mixin-mixout-ssp.conf @@ -24,6 +24,7 @@ Object.Pipeline { } { index $SPEAKER_HOST_PIPELINE_ID + core_id $SPEAKER_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name '$SPEAKER_PLAYBACK_PCM_STREAM_NAME' @@ -34,6 +35,9 @@ Object.Pipeline { name 'Pre Mixer $SPEAKER_PCM_NAME Playback Volume' } } + Object.Widget.pipeline.1 { + core $SPEAKER_PCM_CORE_ID + } } ] @@ -77,6 +81,7 @@ Object.Pipeline { } { index $SPEAKER_DAI_PIPELINE_ID + core_id $SPEAKER_PCM_CORE_ID Object.Widget.dai-copier.1 { dai_index $SPEAKER_SSP_DAI_INDEX @@ -111,6 +116,10 @@ Object.Pipeline { name 'Post Mixer $SPEAKER_PCM_NAME Playback Volume' } } + + Object.Widget.pipeline.1 { + core $SPEAKER_PCM_CORE_ID + } } ] } diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 3b9b3145c5ea..a1bc70655e25 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -94,6 +94,7 @@ Define { HEADSET_DAI_PIPELINE_ID 2 SPEAKER_HOST_PIPELINE_ID 3 SPEAKER_DAI_PIPELINE_ID 4 + SPEAKER_PCM_CORE_ID 0 INCLUDE_ECHO_REF false ECHO_REF_HOST_PIPELINE_ID 7 ECHO_REF_DAI_PIPELINE_ID 8 diff --git a/tools/topology/topology2/platform/intel/deep-buffer.conf b/tools/topology/topology2/platform/intel/deep-buffer.conf index 549c4180a26c..18a4629c7f0c 100644 --- a/tools/topology/topology2/platform/intel/deep-buffer.conf +++ b/tools/topology/topology2/platform/intel/deep-buffer.conf @@ -62,6 +62,7 @@ IncludeByKey.DEEP_BUF_SPK { Object.Pipeline.deepbuffer-playback [ { index $DEEP_BUFFER_PIPELINE_ID_2 + core_id $SPEAKER_PCM_CORE_ID Object.Widget.host-copier.1 { stream_name $DEEP_BUFFER_PCM_NAME_2 @@ -72,6 +73,9 @@ IncludeByKey.DEEP_BUF_SPK { name 'Pre Mixer $DEEP_BUFFER_PCM_NAME_2 Volume' } } + Object.Widget.pipeline.1 { + core $SPEAKER_PCM_CORE_ID + } } ]