Skip to content

topology2: Split the configuration of dolby-dax on the headphone #10642

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

Open
checkupup wants to merge 1 commit into
base: main
Choose a base branch
from
Open

topology2: Split the configuration of dolby-dax on the headphone #10642

Show file tree
Hide file tree
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
180 changes: 122 additions & 58 deletions tools/topology/topology2/cavs-mixin-mixout-dax-ssp.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

Define {
DOLBY_DAX_CORE_ID 0
SSP_HEADSET_DAX "false"
}

# Pipeline ID:1 PCM ID: 0
Expand Down Expand Up @@ -46,72 +47,120 @@ Object.Pipeline {
}
]

mixout-gain-dax-dai-copier-playback [
{
index $HEADSET_DAI_PIPELINE_ID
IncludeByKey.SSP_HEADSET_DAX {
"true" {
mixout-gain-dax-dai-copier-playback [
{
index $HEADSET_DAI_PIPELINE_ID

Object.Widget.dai-copier.1 {
dai_index $HEADSET_SSP_DAI_INDEX
dai_type "SSP"
copier_type "SSP"
stream_name "$HEADSET_CODEC_NAME"
node_type $I2S_LINK_OUTPUT_CLASS
IncludeByKey.SSP_HS_FMT_24 {
"true" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 24
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
Object.Widget.dai-copier.1 {
dai_index $HEADSET_SSP_DAI_INDEX
dai_type "SSP"
copier_type "SSP"
stream_name "$HEADSET_CODEC_NAME"
node_type $I2S_LINK_OUTPUT_CLASS
IncludeByKey.SSP_HS_FMT_24 {
"true" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 24
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
}
]
}
"false" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
}
]
}
"false" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Post Mixer $HEADSET_PCM_NAME Playback Volume'
}
]
}
}
}

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Post Mixer $HEADSET_PCM_NAME Playback Volume'
Object.Widget.dolby-dax.1 {
core_id $DOLBY_DAX_CORE_ID
Object.Control {
mixer."1" {
name 'DAX Headphone Switch'
}
mixer."2" {
name 'DAX Headphone Switch CP'
}
mixer."3" {
name 'DAX Headphone Switch CTC'
}
mixer."4" {
name 'DAX Headphone Volume'
}
enum."1" {
name 'DAX Headphone Profile'
}
enum."2" {
name 'DAX Headphone Device'
}
bytes."1" {
name 'DAX Headphone Tuning'
max 8192
}
}
}
}
}
]
}
"false" {
mixout-gain-dai-copier-playback [
{
index $HEADSET_DAI_PIPELINE_ID

Object.Widget.dolby-dax.1 {
core_id $DOLBY_DAX_CORE_ID
Object.Control {
mixer."1" {
name 'DAX Headphone Switch'
}
mixer."2" {
name 'DAX Headphone Switch CP'
}
mixer."3" {
name 'DAX Headphone Switch CTC'
}
mixer."4" {
name 'DAX Headphone Volume'
}
enum."1" {
name 'DAX Headphone Profile'
}
enum."2" {
name 'DAX Headphone Device'
Object.Widget.dai-copier.1 {
dai_index $HEADSET_SSP_DAI_INDEX
dai_type "SSP"
copier_type "SSP"
stream_name "$HEADSET_CODEC_NAME"
node_type $I2S_LINK_OUTPUT_CLASS
IncludeByKey.SSP_HS_FMT_24 {
"true" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 24
out_sample_type $SAMPLE_TYPE_LSB_INTEGER
out_fmt_cfg "$[($out_channels | ($out_valid_bit_depth * 256))]"
}
]
}
"false" {
Object.Base.output_audio_format [
{
out_bit_depth 32
out_valid_bit_depth 32
}
]
}
}
}
bytes."1" {
name 'DAX Headphone Tuning'
max 8192

Object.Widget.gain.1 {
Object.Control.mixer.1 {
name 'Post Mixer $HEADSET_PCM_NAME Playback Volume'
}
}
}
}
]
}
}

mixout-gain-dax-dai-copier-playback [
{
index $SPEAKER_DAI_PIPELINE_ID
core_id $SPEAKER_PCM_CORE_ID
Expand Down Expand Up @@ -185,11 +234,26 @@ Object.Pipeline {
]
}

Object.Base.route [
{
source "dolby-dax.$HEADSET_DAI_PIPELINE_ID.1"
sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
IncludeByKey.SSP_HEADSET_DAX {
"true" {
Object.Base.route [
{
source "dolby-dax.$HEADSET_DAI_PIPELINE_ID.1"
sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
}
]
}
"false" {
Object.Base.route [
{
source "gain.$HEADSET_DAI_PIPELINE_ID.1"
sink "dai-copier.SSP.$HEADSET_CODEC_NAME.playback"
}
]
}
}

Object.Base.route [
{
source "mixin.$HEADSET_HOST_PIPELINE_ID.1"
sink "mixout.$HEADSET_DAI_PIPELINE_ID.1"
Expand Down
17 changes: 14 additions & 3 deletions tools/topology/topology2/cavs-sdw.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,8 @@ Define {
SDW_AMP_XOVER_EQIIR_PARAMS default
SDW_AMP_XOVER_EQFIR_PARAMS default
DOLBY_DAX_CORE_ID 0
USE_DAX "false"
SDW_AMP_PIPELINE_SRC "generic"
SDW_JACK_PIPELINE_SRC "generic"
SDW_ECHO_REF_DAI "false"
}

Expand Down Expand Up @@ -187,7 +188,12 @@ IncludeByKey.SDW_ECHO_REF_DAI {
IncludeByKey.SDW_AMP_XOVER {
"false" {
IncludeByKey.NUM_SDW_AMP_LINKS {
"[1-3]" "platform/intel/sdw-amp-generic.conf"
"[1-3]" {
IncludeByKey.SDW_AMP_PIPELINE_SRC {
"dax" "platform/intel/sdw-amp-dax.conf"
"generic" "platform/intel/sdw-amp-generic.conf"
}
}
}
IncludeByKey.NUM_SDW_AMP_CTC_LINKS {
"[1-3]" "platform/intel/sdw-amp-generic-ctc.conf"
Expand All @@ -205,7 +211,12 @@ IncludeByKey.SDW_DMIC {
}

IncludeByKey.SDW_JACK {
"true" "platform/intel/sdw-jack-generic.conf"
"true" {
IncludeByKey.SDW_JACK_PIPELINE_SRC {
"dax" "platform/intel/sdw-jack-dax.conf"
"generic" "platform/intel/sdw-jack-generic.conf"
}
}
"false" {
Define {
# disable compressed audio for Jack
Expand Down
Loading
Loading