diff --git a/tools/topology/topology2/cavs-es83x6.conf b/tools/topology/topology2/cavs-es83x6.conf index f25e5a8b89f1..c43498830742 100644 --- a/tools/topology/topology2/cavs-es83x6.conf +++ b/tools/topology/topology2/cavs-es83x6.conf @@ -62,6 +62,7 @@ Define { HEADSET_HW_CONFIG_NAME 'HEADSET HWCFG' HEADSET_PCM_NAME "Headset" HEADSET_PCM_ID 0 + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/cavs-nocodec-bt.conf b/tools/topology/topology2/cavs-nocodec-bt.conf index 0e9217b5481e..fb267f356195 100644 --- a/tools/topology/topology2/cavs-nocodec-bt.conf +++ b/tools/topology/topology2/cavs-nocodec-bt.conf @@ -55,6 +55,7 @@ Define { BT_CP_PCM_CAPS "SSP2 Capture" PLATFORM "none" + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/cavs-nocodec.conf b/tools/topology/topology2/cavs-nocodec.conf index c017252201ac..f4b89f2c7af3 100644 --- a/tools/topology/topology2/cavs-nocodec.conf +++ b/tools/topology/topology2/cavs-nocodec.conf @@ -94,6 +94,7 @@ Define { SSP2_PCM_CORE_ID 2 DMIC0_PCM_0_NAME "DMIC SFX1" DMIC0_PCM_1_NAME "DMIC SFX2" + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf index 8c8c72a208be..dffe0180deb8 100644 --- a/tools/topology/topology2/cavs-rt5682.conf +++ b/tools/topology/topology2/cavs-rt5682.conf @@ -122,6 +122,7 @@ Define { PLAYBACK_PIPELINE_SRC "volume" SSP_SPK_FMT_24 false SSP_HS_FMT_24 false + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf index 57f2fcc2a489..4fc3074d8e3d 100644 --- a/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf +++ b/tools/topology/topology2/cavs-sdw-src-gain-mixin.conf @@ -35,6 +35,7 @@ Define { CAPTURE_LINK_ID 1 JACK_OUT_PCM_NAME "Jack Out" JACK_IN_PCM_NAME "Jack In" + DEFAULT_PIPELINE_PRIORITY 0 } # diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf index 12215b7cdb17..f019dc96e1f2 100644 --- a/tools/topology/topology2/cavs-sdw.conf +++ b/tools/topology/topology2/cavs-sdw.conf @@ -79,6 +79,7 @@ Define { PASSTHROUGH false SDW_JACK_CAPTURE_CH 2 ADD_BT false + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/development/cavs-nocodec-crossover.conf b/tools/topology/topology2/development/cavs-nocodec-crossover.conf index d282c39269b1..dd4345e113d1 100644 --- a/tools/topology/topology2/development/cavs-nocodec-crossover.conf +++ b/tools/topology/topology2/development/cavs-nocodec-crossover.conf @@ -45,6 +45,7 @@ Define { SSP0_PCM_NAME "Port0" SSP1_PCM_NAME "Port1" SSP2_PCM_NAME "Port2" + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf b/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf index a35d9ba1de7c..4423400837f9 100644 --- a/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf +++ b/tools/topology/topology2/development/cavs-nocodec-rtcaec.conf @@ -43,6 +43,7 @@ Define { SSP0_PCM_NAME "Port0" SSP1_PCM_NAME "Port1" SSP2_PCM_NAME "Port2" + DEFAULT_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config diff --git a/tools/topology/topology2/development/sof-plugin.conf b/tools/topology/topology2/development/sof-plugin.conf index cad28485ecc0..6275c149de57 100644 --- a/tools/topology/topology2/development/sof-plugin.conf +++ b/tools/topology/topology2/development/sof-plugin.conf @@ -27,6 +27,10 @@ +Define { + DEFAULT_PIPELINE_PRIORITY 0 +} + Object.Pipeline.io-gateway-capture [ { index 10 diff --git a/tools/topology/topology2/imx8-wm8960.conf b/tools/topology/topology2/imx8-wm8960.conf index ea6ccf92853b..70ed255547e9 100644 --- a/tools/topology/topology2/imx8-wm8960.conf +++ b/tools/topology/topology2/imx8-wm8960.conf @@ -34,6 +34,7 @@ Define { HEADSET_PLAYBACK_PCM_STREAM_NAME "Headset Playback" HEADSET_PCM_NAME "Headset" HEADSET_PCM_ID 0 + DEFAULT_PIPELINE_PRIORITY 0 } # diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf index fb0440ed78fb..3285b9ceee95 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-be.conf @@ -94,7 +94,7 @@ Class.Pipeline."dai-copier-be" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf index 85fa53c9c02a..02e65fe83685 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-eqiir-module-copier-capture.conf @@ -152,7 +152,7 @@ Class.Pipeline."dai-copier-eqiir-module-copier-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf index 4529d2b64059..910eee65b68a 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-mixin-capture.conf @@ -84,7 +84,7 @@ Class.Pipeline."dai-copier-gain-mixin-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf index 46367c772321..660b5b49f54e 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-copier-gain-module-copier-capture.conf @@ -99,7 +99,7 @@ Class.Pipeline."dai-copier-gain-module-copier-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf index 0c3a5823aced..a70503d099ca 100644 --- a/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/dai-kpb-be.conf @@ -119,7 +119,7 @@ Class.Pipeline."dai-kpb-be" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf index d9ae0717bf1f..c31113ddf545 100644 --- a/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/deepbuffer-playback.conf @@ -92,7 +92,7 @@ Class.Pipeline."deepbuffer-playback" { mixin."1" {} pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY # enable lp mode lp_mode 1 } diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf index b193524ebfbd..96f42eaa9708 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-copier-capture.conf @@ -130,7 +130,7 @@ Class.Pipeline."gain-copier-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf index 9dfc7dab6693..a74745c57ad4 100644 --- a/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf +++ b/tools/topology/topology2/include/pipelines/cavs/gain-module-copier.conf @@ -94,7 +94,7 @@ Class.Pipeline."gain-module-copier" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf index cf83b5215b5e..76a0f25105af 100644 --- a/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/google-rtc-aec-capture.conf @@ -43,7 +43,7 @@ Class.Pipeline."google-rtc-aec-capture" { Object.Widget { pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } diff --git a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf index f6e2e7852eed..5325b9c60ef8 100644 --- a/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf +++ b/tools/topology/topology2/include/pipelines/cavs/highpass-capture-be.conf @@ -78,7 +78,7 @@ Class.Pipeline."highpass-capture-be" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf index d785ddb2a597..862eaebb1887 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-mixin-playback.conf @@ -92,7 +92,7 @@ Class.Pipeline."host-copier-gain-mixin-playback" { mixin."1" {} pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf index e38b2887b97a..6223d1a8fb40 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-copier-gain-src-mixin-playback.conf @@ -64,7 +64,7 @@ Class.Pipeline."host-copier-gain-src-mixin-playback" { mixin."1" {} pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf index c9a520f28b80..397e03185ec7 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-capture.conf @@ -98,7 +98,7 @@ Class.Pipeline."host-gateway-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf b/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf index 8954da0f5c9a..96d82ec22175 100644 --- a/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/host-gateway-playback.conf @@ -70,7 +70,7 @@ Class.Pipeline."host-gateway-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf index 465e524ee478..945cf56dd9b9 100644 --- a/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway-capture.conf @@ -54,7 +54,7 @@ Class.Pipeline."io-gateway-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf b/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf index 849dd63e9921..1215fcdf93ed 100644 --- a/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf +++ b/tools/topology/topology2/include/pipelines/cavs/io-gateway.conf @@ -82,7 +82,7 @@ Class.Pipeline."io-gateway" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf index ec8bf0d8ae5a..cfb8b2a88d9e 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-aria-gain-mixin-playback.conf @@ -66,7 +66,7 @@ Class.Pipeline."mixout-aria-gain-mixin-playback" { mixin.1 {} pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf index d773ffb55957..8ead1bef4f47 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-dai-copier-playback.conf @@ -64,7 +64,7 @@ Class.Pipeline."mixout-dai-copier-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf index b06ad1d0639b..4fb73eea3347 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-alh-dai-copier-playback.conf @@ -86,7 +86,7 @@ Class.Pipeline."mixout-gain-alh-dai-copier-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf index f1233f640fbb..d4f2502ca6ef 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-dai-copier-playback.conf @@ -82,7 +82,7 @@ Class.Pipeline."mixout-gain-dai-copier-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf index 60f38dfcc1dd..eee907ff186c 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-dai-copier-playback.conf @@ -161,7 +161,7 @@ Class.Pipeline."mixout-gain-efx-dai-copier-playback" { } } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf index bcb5a89b3b4f..6257b2c7b2ad 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-efx-mbdrc-dai-copier-playback.conf @@ -159,7 +159,7 @@ Class.Pipeline."mixout-gain-efx-mbdrc-dai-copier-playback" { } } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-dai-copier-playback.conf index 078b65799eda..a33bf0c472db 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-eqiir-dts-dai-copier-playback.conf @@ -105,7 +105,7 @@ Class.Pipeline."mixout-gain-eqiir-dts-dai-copier-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf index 3a34a311029f..32f9139881f6 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-host-copier-capture.conf @@ -101,7 +101,7 @@ Class.Pipeline."mixout-gain-host-copier-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf index e60243258fe5..4edc0d01fe27 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-gain-smart-amp-dai-copier-playback.conf @@ -109,7 +109,7 @@ Class.Pipeline."mixout-gain-smart-amp-dai-copier-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf b/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf index bf04d339447a..4c7e13dd1e3b 100644 --- a/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf +++ b/tools/topology/topology2/include/pipelines/cavs/mixout-mixin.conf @@ -41,7 +41,7 @@ Class.Pipeline."mixout-mixin" { mixin.1 {} pipeline.1 { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf index 5d1fc1a45789..5d6ba19d5aca 100644 --- a/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf +++ b/tools/topology/topology2/include/pipelines/cavs/src-gain-mixin-playback.conf @@ -91,7 +91,7 @@ Class.Pipeline."src-gain-mixin-playback" { mixin."1" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf index 0f4490525c83..018691b244fb 100644 --- a/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf +++ b/tools/topology/topology2/include/pipelines/cavs/wov-detect.conf @@ -104,7 +104,7 @@ Class.Pipeline."wov-detect" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/eq-iir-volume-capture.conf b/tools/topology/topology2/include/pipelines/eq-iir-volume-capture.conf index ce381181b9c8..bcfca56f89e7 100644 --- a/tools/topology/topology2/include/pipelines/eq-iir-volume-capture.conf +++ b/tools/topology/topology2/include/pipelines/eq-iir-volume-capture.conf @@ -115,7 +115,7 @@ Class.Pipeline."eq-iir-volume-capture" { direction "capture" time_domain "timer" period 1000 - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY core 0 frames 0 mips 5000 diff --git a/tools/topology/topology2/include/pipelines/gain-capture.conf b/tools/topology/topology2/include/pipelines/gain-capture.conf index 66e2d7df6c6b..4b1e02228d8a 100644 --- a/tools/topology/topology2/include/pipelines/gain-capture.conf +++ b/tools/topology/topology2/include/pipelines/gain-capture.conf @@ -213,7 +213,7 @@ Class.Pipeline."gain-capture" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/gain-playback.conf b/tools/topology/topology2/include/pipelines/gain-playback.conf index 425eedcecdc6..1f84bee7b370 100644 --- a/tools/topology/topology2/include/pipelines/gain-playback.conf +++ b/tools/topology/topology2/include/pipelines/gain-playback.conf @@ -95,7 +95,7 @@ Class.Pipeline."gain-playback" { } pipeline."1" { - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY lp_mode 0 } } diff --git a/tools/topology/topology2/include/pipelines/passthrough-capture.conf b/tools/topology/topology2/include/pipelines/passthrough-capture.conf index e0405178887a..d6643233bee1 100644 --- a/tools/topology/topology2/include/pipelines/passthrough-capture.conf +++ b/tools/topology/topology2/include/pipelines/passthrough-capture.conf @@ -67,7 +67,7 @@ Class.Pipeline."passthrough-capture" { direction "capture" time_domain "timer" period 1000 - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY core 0 frames 0 mips 5000 diff --git a/tools/topology/topology2/include/pipelines/volume-capture.conf b/tools/topology/topology2/include/pipelines/volume-capture.conf index 4f11182fe344..a0b98c21ee3e 100644 --- a/tools/topology/topology2/include/pipelines/volume-capture.conf +++ b/tools/topology/topology2/include/pipelines/volume-capture.conf @@ -99,7 +99,7 @@ Class.Pipeline."volume-capture" { direction "capture" time_domain "timer" period 1000 - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY core 0 frames 0 mips 5000 diff --git a/tools/topology/topology2/include/pipelines/volume-demux-playback.conf b/tools/topology/topology2/include/pipelines/volume-demux-playback.conf index 595827b662ed..80e6128a3689 100644 --- a/tools/topology/topology2/include/pipelines/volume-demux-playback.conf +++ b/tools/topology/topology2/include/pipelines/volume-demux-playback.conf @@ -115,7 +115,7 @@ Class.Pipeline."volume-demux-playback" { direction "playback" time_domain "timer" period 1000 - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY core 0 frames 0 mips 5000 diff --git a/tools/topology/topology2/include/pipelines/volume-playback.conf b/tools/topology/topology2/include/pipelines/volume-playback.conf index b4ca2646b0a8..8165786b8853 100644 --- a/tools/topology/topology2/include/pipelines/volume-playback.conf +++ b/tools/topology/topology2/include/pipelines/volume-playback.conf @@ -100,7 +100,7 @@ Class.Pipeline."volume-playback" { direction "playback" time_domain "timer" period 1000 - priority 0 + priority $DEFAULT_PIPELINE_PRIORITY core 0 frames 0 mips 5000 diff --git a/tools/topology/topology2/platform/intel/dmic-generic.conf b/tools/topology/topology2/platform/intel/dmic-generic.conf index e966a7d62b03..b0af52788554 100644 --- a/tools/topology/topology2/platform/intel/dmic-generic.conf +++ b/tools/topology/topology2/platform/intel/dmic-generic.conf @@ -195,6 +195,7 @@ IncludeByKey.PASSTHROUGH { } Object.Widget.pipeline."1" { core $DMIC_CORE_ID + priority $DMIC_PIPELINE_PRIORITY } } ] @@ -419,6 +420,10 @@ IncludeByKey.PASSTHROUGH { } ] } + Object.Widget.pipeline."1" { + core $DMIC_CORE_ID + priority $DMIC_PIPELINE_PRIORITY + } } ] Object.Pipeline.io-gateway-capture [ @@ -492,6 +497,10 @@ IncludeByKey.PASSTHROUGH { } ] } + Object.Widget.pipeline."1" { + core $DMIC_CORE_ID + priority $DMIC_PIPELINE_PRIORITY + } } ] Object.Base.route [ diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf index 16b39440bf58..1f1f435ba067 100644 --- a/tools/topology/topology2/sof-hda-generic.conf +++ b/tools/topology/topology2/sof-hda-generic.conf @@ -52,6 +52,8 @@ Define { DMIC0_DAI_GAIN 'eqiir.12.1' DMIC0_DAI_EQIIR "highpass_40hz_20db" DMIC0_PCM_CAPS 'Gain Capture 11' + DEFAULT_PIPELINE_PRIORITY 1 + DMIC_PIPELINE_PRIORITY 0 } # override defaults with platform-specific config