Skip to content

topology2: sof-mtl-rt713-l0-rt1316-l12-rt1713-l3: Enable ChainDMA #8527

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ujfalusi wants to merge 1 commit into from
Closed

topology2: sof-mtl-rt713-l0-rt1316-l12-rt1713-l3: Enable ChainDMA #8527

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/topology/topology2/sof-ace-tplg/tplg-targets.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ SDW_JACK_OUT_STREAM=Playback-SimpleJack,SDW_JACK_IN_STREAM=Capture-SimpleJack"
USE_CHAIN_DMA=true,NUM_SDW_AMP_LINKS=2,SDW_SPK_STREAM=SDW1-Playback,SDW_SPK_IN_STREAM=SDW1-Capture,\
SDW_DMIC_STREAM=SDW0-Capture"

"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12-rt1713-l3\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1"
"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12-rt1713-l3\;PLATFORM=mtl,USE_CHAIN_DMA=true,NUM_SDW_AMP_LINKS=2,SDW_DMIC=1"
Copy link
Collaborator

@kv2019i kv2019i Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao We can do this in steps (multiple PRs), but we need to enable USE_CHAIN_DMA in all topoplogies unless there's a very strong reason not do. This enables bitstream passthrough for display audio.

Copy link
Collaborator

@bardliao bardliao Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bardliao We can do this in steps (multiple PRs), but we need to enable USE_CHAIN_DMA in all topoplogies unless there's a very strong reason not do. This enables bitstream passthrough for display audio.

Can we set USE_CHAIN_DMA = true by default? Like

diff --git a/tools/topology/topology2/cavs-rt5682.conf b/tools/topology/topology2/cavs-rt5682.conf
index f3cdc8d47aeb..227a839c19ac 100644
--- a/tools/topology/topology2/cavs-rt5682.conf
+++ b/tools/topology/topology2/cavs-rt5682.conf
@@ -69,7 +69,7 @@ Define {
        HDMI4_ID                        6
        SPK_ID                          7
        PLATFORM                        "none"
-       USE_CHAIN_DMA                   "false"
+       USE_CHAIN_DMA                   "true"
        DEEP_BUFFER_PIPELINE_ID         15
        DEEP_BUFFER_PCM_ID              31
        DEEP_BUFFER_PIPELINE_SRC        'mixin.15.1'
diff --git a/tools/topology/topology2/cavs-sdw.conf b/tools/topology/topology2/cavs-sdw.conf
index a33e60e92d6d..64d88a3eae13 100644
--- a/tools/topology/topology2/cavs-sdw.conf
+++ b/tools/topology/topology2/cavs-sdw.conf
@@ -63,7 +63,7 @@ Define {
        DMIC0_ID 4
        DMIC1_ID 5
        DMIC0_PCM_CAPS 'Gain Capture 13'
-       USE_CHAIN_DMA   "false"
+       USE_CHAIN_DMA   "true"
        DEEP_BUFFER_PIPELINE_ID         15
        DEEP_BUFFER_PCM_ID              31
        DEEP_BUFFER_PIPELINE_SRC        'mixin.15.1'
diff --git a/tools/topology/topology2/sof-hda-generic.conf b/tools/topology/topology2/sof-hda-generic.conf
index 1bd06bff796f..c732463c4aff 100644
--- a/tools/topology/topology2/sof-hda-generic.conf
+++ b/tools/topology/topology2/sof-hda-generic.conf
@@ -43,7 +43,7 @@ Define {
        HDA_CONFIG  "none"
        PLATFORM "none"
        NUM_DMICS 0
-       USE_CHAIN_DMA   "false"
+       USE_CHAIN_DMA   "true"
 # doesn't it need to define DMIC0_HOST_PIPELINE_SINK and DMIC0_DAI_PIPELINE_SRC?
        DMIC0_HOST_PIPELINE_SINK 'gain.11.1'
        DMIC0_DAI_PIPELINE_SRC 'module-copier.12.2'

Copy link
Member

@plbossart plbossart Nov 27, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should use HDMI_USE_CHAIN_DMA to make sure we don't make any confusions. HDaudio can also be handled with chain_dma.

Also this should be a global property for MTL, not something that is changed in each variant.


# Jack codec + SmartAmp topology. No SDW_DMIC connection
"cavs-sdw\;sof-mtl-rt713-l0-rt1316-l12\;PLATFORM=mtl,NUM_SDW_AMP_LINKS=2,HDMI1_ID=4,HDMI2_ID=5,HDMI3_ID=6"
Expand Down