Skip to content

Commit a19f2c8

Browse files
ujfalusiujfalusi
committed
topology2: Rename USE_CHAIN_DMA to HDMI_USE_CHAIN_DMA
In practice all HDA links (on LNL SDW/SSP/DMIC also) can use ChainDMA, but the flag is used to enable this only for display links. Rename the flag to be precise about this. Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com>
1 parent fb229b9 commit a19f2c8

7 files changed

Lines changed: 41 additions & 37 deletions

File tree

‎tools/topology/topology2/avs-tplg/tplg-targets.cmake‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,18 @@
33
# Array of "input-file-name;output-file-name;comma separated pre-processor variables"
44
set(TPLGS
55
# CAVS HDMI only topology with passthrough pipelines
6-
"sof-hda-generic\;sof-hda-generic-idisp\;USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
6+
"sof-hda-generic\;sof-hda-generic-idisp\;HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
77
# CAVS HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
8-
"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
8+
"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
99
# If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the
1010
# topologies below.
1111
"sof-hda-generic\;sof-hda-generic-2ch\;\
12-
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,USE_CHAIN_DMA=true,\
13-
DEEPBUFFER_FW_DMA_MS=100"
12+
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,\
13+
HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
1414
"sof-hda-generic\;sof-hda-generic-4ch\;\
15-
HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
16-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
15+
HDA_CONFIG=mix,NUM_DMICS=4,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,\
16+
HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
17+
PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1"
1718

1819
# IPC4 topology for TGL rt711 Headset + rt1316 Amplifier + rt714 DMIC
1920
"cavs-sdw\;sof-tgl-rt711-rt1316-rt714\;NUM_SDW_AMP_LINKS=2,SDW_DMIC=1,\

‎tools/topology/topology2/cavs-rt5682.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ Define {
7070
HDMI4_ID 6
7171
SPK_ID 7
7272
PLATFORM "none"
73-
USE_CHAIN_DMA "false"
73+
HDMI_USE_CHAIN_DMA "false"
7474
DEEP_BUFFER_PIPELINE_ID 15
7575
DEEP_BUFFER_PCM_ID 31
7676
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'

‎tools/topology/topology2/cavs-sdw.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ Define {
6363
DMIC0_ID 4
6464
DMIC1_ID 5
6565
DMIC0_PCM_CAPS 'Gain Capture 13'
66-
USE_CHAIN_DMA "false"
66+
HDMI_USE_CHAIN_DMA "false"
6767
DEEP_BUFFER_PIPELINE_ID 15
6868
DEEP_BUFFER_PCM_ID 31
6969
DEEP_BUFFER_PIPELINE_SRC 'mixin.15.1'

‎tools/topology/topology2/development/tplg-targets.cmake‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -56,38 +56,38 @@ NHLT_BIN=nhlt-sof-lnl-nocodec-fpga-4ch.bin,PASSTHROUGH=true,DMIC_IO_CLK=19200000
5656
"cavs-sdw\;sof-lnl-fpga-rt711-l0\;PLATFORM=lnl,NUM_HDMIS=0,PASSTHROUGH=true"
5757

5858
# CAVS HDA topology with mixer-based efx eq pipelines for HDA and passthrough pipelines for HDMI
59-
"sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
59+
"sof-hda-generic\;sof-hda-efx-generic\;HDA_CONFIG=efx,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
6060
EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,EFX_DRC_PARAMS=passthrough"
6161

6262
"sof-hda-generic\;sof-hda-efx-generic-2ch\;\
6363
HDA_CONFIG=efx,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-fir-generic-2ch.bin,\
64-
USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
64+
HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
6565
EFX_DRC_PARAMS=passthrough"
6666

6767
"sof-hda-generic\;sof-hda-efx-generic-4ch\;\
6868
HDA_CONFIG=efx,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
69-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-efx-generic-4ch.bin,USE_CHAIN_DMA=true,\
69+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-efx-generic-4ch.bin,HDMI_USE_CHAIN_DMA=true,\
7070
DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
7171
EFX_DRC_PARAMS=passthrough"
7272

7373
"sof-hda-generic\;sof-hda-efx-mbdrc-generic\;\
74-
HDA_CONFIG=efx,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
74+
HDA_CONFIG=efx,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
7575
EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
7676
EFX_DRC_COMPONENT=multiband,EFX_MBDRC_PARAMS=passthrough"
7777

7878
"sof-hda-generic\;sof-hda-efx-mbdrc-generic-2ch\;\
7979
HDA_CONFIG=efx,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-fir-generic-2ch.bin,\
80-
USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
80+
HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
8181
EFX_DRC_COMPONENT=multiband,EFX_MBDRC_PARAMS=passthrough"
8282

8383
"sof-hda-generic\;sof-hda-efx-mbdrc-generic-4ch\;\
8484
HDA_CONFIG=efx,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
85-
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-efx-generic-4ch.bin,USE_CHAIN_DMA=true,\
85+
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-efx-generic-4ch.bin,HDMI_USE_CHAIN_DMA=true,\
8686
DEEPBUFFER_FW_DMA_MS=100,EFX_FIR_PARAMS=passthrough,EFX_IIR_PARAMS=passthrough,\
8787
EFX_DRC_COMPONENT=multiband,EFX_MBDRC_PARAMS=passthrough"
8888

8989
# CAVS HDA topology with gain and SRC before mixin for HDA and passthrough pipelines for HDMI
90-
"sof-hda-generic\;sof-hda-src-generic\;HDA_CONFIG=src,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
90+
"sof-hda-generic\;sof-hda-src-generic\;HDA_CONFIG=src,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100"
9191

9292
# BT offload for tgl
9393
"cavs-nocodec-bt\;sof-nocodec-bt-tgl\;PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-tgl.bin,\
@@ -105,9 +105,12 @@ PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-nocodec-bt-mtl-lbm.bin"
105105

106106
# CAVS HDA topology for benchmarking performance
107107
# Copier - peak volume - mixin - mixout - aria - peak volume - mixin - mixout - copier
108-
"sof-hda-generic\;sof-hda-benchmark-generic-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,USE_CHAIN_DMA=true,BENCH_CONFIG=benchmark"
109-
"sof-hda-generic\;sof-hda-benchmark-generic-mtl\;PLATFORM=MTL,HDA_CONFIG=benchmark,USE_CHAIN_DMA=true,BENCH_CONFIG=benchmark"
110-
"sof-hda-generic\;sof-hda-benchmark-generic-lnl\;PLATFORM=LNL,HDA_CONFIG=benchmark,USE_CHAIN_DMA=true,BENCH_CONFIG=benchmark"
108+
"sof-hda-generic\;sof-hda-benchmark-generic-tgl\;PLATFORM=TGL,HDA_CONFIG=benchmark,\
109+
HDMI_USE_CHAIN_DMA=true,BENCH_CONFIG=benchmark"
110+
"sof-hda-generic\;sof-hda-benchmark-generic-mtl\;PLATFORM=MTL,HDA_CONFIG=benchmark,\
111+
HDMI_USE_CHAIN_DMA=true,BENCH_CONFIG=benchmark"
112+
"sof-hda-generic\;sof-hda-benchmark-generic-lnl\;PLATFORM=LNL,HDA_CONFIG=benchmark,\
113+
HDMI_USE_CHAIN_DMA=true,BENCH_CONFIG=benchmark"
111114

112115
# Topology to test IPC4 Crossover
113116
"development/cavs-nocodec-crossover\;sof-tgl-nocodec-crossover-2way\;PLATFORM=tgl,\

‎tools/topology/topology2/platform/intel/hdmi-generic.conf‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ Object.Pipeline {
4040
}
4141

4242
index $HDMI1_HOST_PIPELINE_ID
43-
use_chain_dma $USE_CHAIN_DMA
43+
use_chain_dma $HDMI_USE_CHAIN_DMA
4444
}
4545
{
4646
Object.Widget.host-copier.1 {
@@ -49,7 +49,7 @@ Object.Pipeline {
4949
}
5050

5151
index $HDMI2_HOST_PIPELINE_ID
52-
use_chain_dma $USE_CHAIN_DMA
52+
use_chain_dma $HDMI_USE_CHAIN_DMA
5353
}
5454
{
5555
Object.Widget.host-copier.1 {
@@ -58,7 +58,7 @@ Object.Pipeline {
5858
}
5959

6060
index $HDMI3_HOST_PIPELINE_ID
61-
use_chain_dma $USE_CHAIN_DMA
61+
use_chain_dma $HDMI_USE_CHAIN_DMA
6262
}
6363
]
6464
io-gateway [
@@ -89,7 +89,7 @@ Object.Pipeline {
8989
}
9090
]
9191
}
92-
use_chain_dma $USE_CHAIN_DMA
92+
use_chain_dma $HDMI_USE_CHAIN_DMA
9393
}
9494
{
9595
direction "playback"
@@ -118,7 +118,7 @@ Object.Pipeline {
118118
}
119119
]
120120
}
121-
use_chain_dma $USE_CHAIN_DMA
121+
use_chain_dma $HDMI_USE_CHAIN_DMA
122122
}
123123
{
124124
direction "playback"
@@ -146,7 +146,7 @@ Object.Pipeline {
146146
}
147147
]
148148
}
149-
use_chain_dma $USE_CHAIN_DMA
149+
use_chain_dma $HDMI_USE_CHAIN_DMA
150150
}
151151
]
152152
}
@@ -252,7 +252,7 @@ IncludeByKey.NUM_HDMIS {
252252
}
253253
]
254254
}
255-
use_chain_dma $USE_CHAIN_DMA
255+
use_chain_dma $HDMI_USE_CHAIN_DMA
256256
}
257257
]
258258
Object.Pipeline.host-gateway-playback [
@@ -263,7 +263,7 @@ IncludeByKey.NUM_HDMIS {
263263
}
264264

265265
index $HDMI4_HOST_PIPELINE_ID
266-
use_chain_dma $USE_CHAIN_DMA
266+
use_chain_dma $HDMI_USE_CHAIN_DMA
267267
}
268268
]
269269
Object.PCM.pcm [

‎tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
# Array of "input-file-name;output-file-name;comma separated pre-processor variables"
44
set(TPLGS
55
# HDMI only topology with passthrough pipelines
6-
"sof-hda-generic\;sof-hda-generic-idisp\;USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
6+
"sof-hda-generic\;sof-hda-generic-idisp\;HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
77
DEEPBUFFER_D0I3_COMPATIBLE=true"
88
# HDA topology with mixer-based pipelines for HDA and passthrough pipelines for HDMI
9-
"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
9+
"sof-hda-generic\;sof-hda-generic\;HDA_CONFIG=mix,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
1010
DEEPBUFFER_D0I3_COMPATIBLE=true"
1111
# If the alsatplg plugins for NHLT are not available, the NHLT blobs will not be added to the
1212
# topologies below.
1313
"sof-hda-generic\;sof-hda-generic-4ch\;PLATFORM=mtl,\
1414
HDA_CONFIG=mix,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,PREPROCESS_PLUGINS=nhlt,\
15-
NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
15+
NHLT_BIN=nhlt-sof-hda-generic-4ch.bin,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,\
1616
DEEPBUFFER_D0I3_COMPATIBLE=true"
1717
"sof-hda-generic\;sof-hda-generic-2ch\;PLATFORM=mtl,\
1818
HDA_CONFIG=mix,NUM_DMICS=2,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch.bin,\
19-
USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,DEEPBUFFER_D0I3_COMPATIBLE=true"
19+
HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_FW_DMA_MS=100,DEEPBUFFER_D0I3_COMPATIBLE=true"
2020

2121
# SDW + DMIC topology with passthrough pipelines
2222
# We will change NUM_HDMIS to 3 once HDMI is enabled on MTL RVP
@@ -32,7 +32,7 @@ SDW_AMP_FEEDBACK=false,SDW_SPK_STREAM=Playback-SmartAmp,SDW_DMIC_STREAM=Capture-
3232
SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
3333

3434
"cavs-sdw\;sof-mtl-rt1318-l12-rt714-l0\;PLATFORM=mtl,SDW_JACK=false,SDW_DMIC=1,\
35-
USE_CHAIN_DMA=true,NUM_SDW_AMP_LINKS=2,SDW_SPK_STREAM=SDW1-Playback,SDW_SPK_IN_STREAM=SDW1-Capture,\
35+
HDMI_USE_CHAIN_DMA=true,NUM_SDW_AMP_LINKS=2,SDW_SPK_STREAM=SDW1-Playback,SDW_SPK_IN_STREAM=SDW1-Capture,\
3636
SDW_DMIC_STREAM=SDW0-Capture"
3737

3838
"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12-rt1713-l3\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1"
@@ -54,32 +54,32 @@ SDW_JACK_IN_STREAM=Capture-SimpleJack,SDW_AMP_FMT_24=true,SDW_JACK_FMT_24=true"
5454
"cavs-rt5682\;sof-mtl-max98357a-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
5555
PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
5656
NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,SPK_ID=6,DEEPBUFFER_FW_DMA_MS=10,INCLUDE_ECHO_REF=true,\
57-
BT_NAME=SSP2-BT,BT_ID=7,BT_PCM_NAME=Bluetooth,USE_CHAIN_DMA=true,DEEPBUFFER_D0I3_COMPATIBLE=true,\
57+
BT_NAME=SSP2-BT,BT_ID=7,BT_PCM_NAME=Bluetooth,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_D0I3_COMPATIBLE=true,\
5858
GOOGLE_RTC_AEC_SUPPORT=1"
5959

6060
"cavs-rt5682\;sof-mtl-max98357a-rt5682-ssp2-ssp0\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
6161
PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,\
6262
NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
6363
SPK_ID=6,SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
64-
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,USE_CHAIN_DMA=true,\
64+
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,HDMI_USE_CHAIN_DMA=true,\
6565
DEEPBUFFER_D0I3_COMPATIBLE=true,GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true"
6666

6767
"cavs-rt5682\;sof-mtl-max98357a-rt5682-ssp2-ssp0-2ch-pdm1\;PLATFORM=mtl,NUM_DMICS=2,\
6868
PDM0_MIC_A_ENABLE=0,PDM0_MIC_B_ENABLE=0,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,\
6969
DMIC0_PCM_ID=99,PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-max98357a-rt5682-2ch.bin,\
7070
HEADSET_SSP_DAI_INDEX=2,SPEAKER_SSP_DAI_INDEX=0,SPK_ID=6,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
71-
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,USE_CHAIN_DMA=true,\
71+
BT_NAME=SSP1-BT,BT_INDEX=1,BT_ID=7,BT_PCM_NAME=Bluetooth,INCLUDE_ECHO_REF=true,HDMI_USE_CHAIN_DMA=true,\
7272
DEEPBUFFER_FW_DMA_MS=10,DEEPBUFFER_D0I3_COMPATIBLE=true,GOOGLE_RTC_AEC_SUPPORT=1,DEEP_BUF_SPK=true"
7373

7474
"cavs-rt5682\;sof-mtl-rt1019-rt5682\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
7575
PDM1_MIC_B_ENABLE=1,DMIC0_PCM_ID=99,SPK_ID=6,PREPROCESS_PLUGINS=nhlt,\
7676
NHLT_BIN=nhlt-sof-max98357a-rt5682.bin,DEEPBUFFER_FW_DMA_MS=10,HEADSET_SSP_DAI_INDEX=2,\
7777
SPEAKER_SSP_DAI_INDEX=0,HEADSET_CODEC_NAME=SSP2-Codec,SPEAKER_CODEC_NAME=SSP0-Codec,\
78-
INCLUDE_ECHO_REF=true,USE_CHAIN_DMA=true,DEEPBUFFER_D0I3_COMPATIBLE=true,INCLUDE_BT_OFFLOAD=false"
78+
INCLUDE_ECHO_REF=true,HDMI_USE_CHAIN_DMA=true,DEEPBUFFER_D0I3_COMPATIBLE=true,INCLUDE_BT_OFFLOAD=false"
7979

8080
# SDW + DMIC + HDMI
8181
"cavs-sdw\;sof-mtl-sdw-cs42l42-l0-max98363-l2\;PLATFORM=mtl,NUM_DMICS=4,PDM1_MIC_A_ENABLE=1,\
82-
PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,USE_CHAIN_DMA=true,\
82+
PDM1_MIC_B_ENABLE=1,DMIC0_ID=3,DMIC1_ID=4,HDMI_USE_CHAIN_DMA=true,\
8383
PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-mtl-sdw-cs42l42-l0-max98363-l2.bin,\
8484
BT_NAME=SSP1-BT,BT_INDEX=1,BT_PCM_ID=20,BT_ID=8,BT_PCM_NAME=Bluetooth,ADD_BT=true,\
8585
NUM_SDW_AMP_LINKS=1,SDW_SPK_STREAM=SDW2-Playback,SDW_AMP_FEEDBACK=false,\

‎tools/topology/topology2/sof-hda-generic.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ Define {
4444
HDA_CONFIG "none"
4545
PLATFORM "none"
4646
NUM_DMICS 0
47-
USE_CHAIN_DMA "false"
47+
HDMI_USE_CHAIN_DMA "false"
4848
# doesn't it need to define DMIC0_HOST_PIPELINE_SINK and DMIC0_DAI_PIPELINE_SRC?
4949
DMIC0_HOST_PIPELINE_SINK 'gain.11.1'
5050
DMIC0_DAI_PIPELINE_SRC 'module-copier.12.2'

0 commit comments

Comments
 (0)