diff --git a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf index b567e5f810bb..77cc8329ec6e 100644 --- a/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf +++ b/tools/topology/topology2/cavs-src-mixin-mixout-hda.conf @@ -7,6 +7,8 @@ Define { DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1' DEEP_BUFFER_PIPELINE_SINK 'mixout.2.1' DEEP_BUFFER_PCM_NAME 'Deepbuffer HDA Analog' + SRC_CORE 0 + SRC_DOMAIN "default" } # include deep buffer config if buffer size is in 1 - 1000 ms. @@ -31,6 +33,7 @@ Object.Pipeline { mixout-gain-dai-copier-playback [ { index 2 + core_id $SRC_CORE Object.Widget.dai-copier.1 { node_type $HDA_LINK_OUTPUT_CLASS @@ -43,12 +46,16 @@ Object.Pipeline { name '2 Main Playback Volume' } } + Object.Widget.pipeline.1 { + core $SRC_CORE + } } ] host-copier-gain-src-mixin-playback [ { index 1 + core_id $SRC_CORE Object.Widget.host-copier.1 { stream_name $ANALOG_PLAYBACK_PCM @@ -56,6 +63,7 @@ Object.Pipeline { } Object.Widget.src.1 { + scheduler_domain "$SRC_DOMAIN" } Object.Widget.gain.1 { @@ -63,6 +71,9 @@ Object.Pipeline { name '1 2nd Playback Volume' } } + Object.Widget.pipeline.1 { + core $SRC_CORE + } } ] diff --git a/tools/topology/topology2/development/tplg-targets.cmake b/tools/topology/topology2/development/tplg-targets.cmake index ab6a8b2976b5..8835fad0635d 100644 --- a/tools/topology/topology2/development/tplg-targets.cmake +++ b/tools/topology/topology2/development/tplg-targets.cmake @@ -270,6 +270,10 @@ GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true,GOOGLE_AEC_DP_CORE_ID=2" # CAVS HDA topology with gain and SRC before mixin for HDA and passthrough pipelines for HDMI "sof-hda-generic\;sof-hda-src-generic\;HDA_CONFIG=src" +# Like above but with SRC in DP mode on core 2 +"sof-hda-generic\;sof-hda-src-generic-dp\;HDA_CONFIG=src,DEEP_BUFFER_CORE=2,SRC_CORE=2,\ +SRC_DOMAIN=DP" + # BT offload for tgl "cavs-nocodec-bt\;sof-nocodec-bt-tgl\;PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-tgl.bin,\ PLATFORM=tgl" diff --git a/tools/topology/topology2/platform/intel/deep-buffer.conf b/tools/topology/topology2/platform/intel/deep-buffer.conf index 5b86088feddf..a6cc498f5b14 100644 --- a/tools/topology/topology2/platform/intel/deep-buffer.conf +++ b/tools/topology/topology2/platform/intel/deep-buffer.conf @@ -1,7 +1,11 @@ +Define { + DEEP_BUFFER_CORE 0 +} Object.Pipeline.deepbuffer-playback [ { index $DEEP_BUFFER_PIPELINE_ID + core_id $DEEP_BUFFER_CORE Object.Widget.host-copier.1 { stream_name $DEEP_BUFFER_PCM_NAME @@ -104,6 +108,9 @@ Object.Pipeline.deepbuffer-playback [ } ] } + Object.Widget.pipeline.1 { + core $DEEP_BUFFER_CORE + } } ]