OrgACRN
/
sof
mirror of https://github.com/thesofproject/sof.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

topology1: sof-hda-generic: make deep-buffer optional 

We don't want to release these topologies to world+dog due to
dependencies on kernel version, so let's make the deep-buffer
optional. The next patch will enable these topologies in the
development/ directory.

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
This commit is contained in:
Pierre-Louis Bossart 2022-04-04 17:44:44 -05:00 committed by Liam Girdwood
parent 030f27d556
commit 94203a22ff
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/topology/topology1/sof-hda-generic.m4
View File

@ -107,12 +107,16 @@ PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
# Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le # Deep buffer playback pipeline 31 on PCM 31 using max 2 channels of s32le
# Set 1000us deadline on core 0 with priority 0. # Set 1000us deadline on core 0 with priority 0.
# TODO: Modify pipeline deadline to account for deep buffering # TODO: Modify pipeline deadline to account for deep buffering
ifdef(`DEEP_BUFFER',
`
PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4, PIPELINE_PCM_ADD(sof/pipe-host-volume-playback.m4,
31, 31, 2, s32le, 31, 31, 2, s32le,
1000, 0, 0, 1000, 0, 0,
48000, 48000, 48000, 48000, 48000, 48000,
SCHEDULE_TIME_DOMAIN_TIMER, SCHEDULE_TIME_DOMAIN_TIMER,
PIPELINE_PLAYBACK_SCHED_COMP_1) PIPELINE_PLAYBACK_SCHED_COMP_1)
'
)
# Undefine PIPELINE_FILTERx to avoid to propagate elsewhere, other endpoints # Undefine PIPELINE_FILTERx to avoid to propagate elsewhere, other endpoints
# with filters blobs will need similar handling as HSPROC_FILTERx. # with filters blobs will need similar handling as HSPROC_FILTERx.
@ -153,12 +157,20 @@ SectionGraph."mixer-host" {
lines [ lines [
# connect mixer dai pipelines to PCM pipelines # connect mixer dai pipelines to PCM pipelines
dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30) dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_30)
ifdef(`DEEP_BUFFER',
`
dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_31) dapm(PIPELINE_MIXER_1, PIPELINE_SOURCE_31)
'
)
] ]
} }
PCM_DUPLEX_ADD(HDA Analog, 0, PIPELINE_PCM_30, PIPELINE_PCM_2) PCM_DUPLEX_ADD(HDA Analog, 0, PIPELINE_PCM_30, PIPELINE_PCM_2)
ifdef(`DEEP_BUFFER',
`
PCM_PLAYBACK_ADD(HDA Analog Deep Buffer, 31, PIPELINE_PCM_31) PCM_PLAYBACK_ADD(HDA Analog Deep Buffer, 31, PIPELINE_PCM_31)
'
)
PCM_PLAYBACK_ADD(HDMI1, 3, PIPELINE_PCM_7) PCM_PLAYBACK_ADD(HDMI1, 3, PIPELINE_PCM_7)
PCM_PLAYBACK_ADD(HDMI2, 4, PIPELINE_PCM_8) PCM_PLAYBACK_ADD(HDMI2, 4, PIPELINE_PCM_8)
PCM_PLAYBACK_ADD(HDMI3, 5, PIPELINE_PCM_9) PCM_PLAYBACK_ADD(HDMI3, 5, PIPELINE_PCM_9)