Skip to content
Snippets Groups Projects
Commit f5b07e9f authored by Srini Kandagatla's avatar Srini Kandagatla
Browse files

Merge branch 'x1e80100' into 'master' 

audioreach: x1e80100: add display port support

See merge request !7
parents b4dcc25e e22c1633
No related branches found
No related tags found
1 merge request!7audioreach: x1e80100: add display port support
Hide whitespace changes
Inline Side-by-side
SC8280XP-LENOVO-X13S.m4
+ 21
− 5
View file @ f5b07e9f
......@@ -22,6 +22,7 @@ dnl Playback MultiMedia2
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-vol-playback.m4, FRONTEND_DAI_MULTIMEDIA2,
`S16_LE', 48000, 48000, 2, 2,
0x00004002, 0x00004002, 0x00006010)
dnl Capture MultiMedia3
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA3,
`S16_LE', 48000, 48000, 1, 2,
......@@ -47,31 +48,46 @@ dnl WSA Playback
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `WSA_CODEC_DMA_RX_0', WSA_CODEC_DMA_RX_0,
`S16_LE', 48000, 48000, 2, 2,
LPAIF_INTF_TYPE_WSA, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
0x00004005, 0x00004005, 0x00006050)
0x00004010, 0x00004010, 0x00006100)
dnl
dnl WCDRX Playback
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `RX_CODEC_DMA_RX_0', RX_CODEC_DMA_RX_0,
`S16_LE', 48000, 48000, 2, 2,
`S16_LE', 48000, 48000, 2, 2,
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
0x00004007, 0x00004007, 0x00006070)
0x00004011, 0x00004011, 0x00006110)
dnl
dnl Display port0 Playback
DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_0', DISPLAY_PORT_RX_0,
`S16_LE', 48000, 48000, 2, 2,
0, 0, 0, DATA_FORMAT_FIXED_POINT,
0x00004012, 0x00004012, 0x00006120, `DISPLAY_PORT_RX_0')
dnl
dnl Display port1 Playback
DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_1', DISPLAY_PORT_RX_1,
`S16_LE', 48000, 48000, 2, 2,
0, 0, 0, DATA_FORMAT_FIXED_POINT,
0x00004013, 0x00004013, 0x00006130, `DISPLAY_PORT_RX_1')
dnl VA Capture
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0,
`S16_LE', 48000, 48000, 1, 2,
LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT,
0x00004008, 0x00004008, 0x00006080)
0x00004015, 0x00004015, 0x00006150)
dnl
dnl WCDTX Capture
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_3', TX_CODEC_DMA_TX_3,
`S16_LE', 48000, 48000, 1, 2,
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_TX3, 0, DATA_FORMAT_FIXED_POINT,
0x00004009, 0x00004009, 0x00006090)
0x00004016, 0x00004016, 0x00006160)
STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_1, ``DISPLAY_PORT_RX_1'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_1, ``DISPLAY_PORT_RX_1 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )
......
X1E80100-CRD.m4
+ 20
− 4
View file @ f5b07e9f
......@@ -28,7 +28,7 @@ STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA
0x00004003, 0x00004003, 0x00006020, `110000')
dnl Capture MultiMedia4
STREAM_SG_PCM_ADD(audioreach/subgraph-stream-capture.m4, FRONTEND_DAI_MULTIMEDIA4,
`S16_LE', 48000, 48000, 1, 2,
`S16_LE', 48000, 48000, 1, 4,
0x00004004, 0x00004004, 0x00006030, `110000')
#
#
......@@ -55,23 +55,39 @@ DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-playback.m4, `RX_CODEC_DMA_RX
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_RX0, 0, DATA_FORMAT_FIXED_POINT,
0x00004007, 0x00004007, 0x00006070)
dnl
dnl Display port0 Playback
DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_0', DISPLAY_PORT_RX_0,
`S16_LE', 48000, 48000, 2, 2,
0, 0, 0, DATA_FORMAT_FIXED_POINT,
0x00004012, 0x00004012, 0x00006120, `DISPLAY_PORT_RX_0')
dnl
dnl Display port1 Playback
DEVICE_SG_ADD(audioreach/subgraph-device-display-port-playback.m4, `DISPLAY_PORT_RX_1', DISPLAY_PORT_RX_1,
`S16_LE', 48000, 48000, 2, 2,
0, 0, 0, DATA_FORMAT_FIXED_POINT,
0x00004013, 0x00004013, 0x00006130, `DISPLAY_PORT_RX_1')
dnl
dnl VA Capture
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `VA_CODEC_DMA_TX_0', VA_CODEC_DMA_TX_0,
`S16_LE', 48000, 48000, 1, 2,
`S16_LE', 48000, 48000, 1, 4,
LPAIF_INTF_TYPE_VA, CODEC_INTF_IDX_TX0, 0, DATA_FORMAT_FIXED_POINT,
0x00004008, 0x00004008, 0x00006080)
0x00004018, 0x00004018, 0x00006180)
dnl
dnl WCDTX Capture
DEVICE_SG_ADD(audioreach/subgraph-device-codec-dma-capture.m4, `TX_CODEC_DMA_TX_3', TX_CODEC_DMA_TX_3,
`S16_LE', 48000, 48000, 1, 2,
LPAIF_INTF_TYPE_RXTX, CODEC_INTF_IDX_TX3, 0, DATA_FORMAT_FIXED_POINT,
0x00004009, 0x00004009, 0x00006090)
0x00004019, 0x00004019, 0x00006190)
STREAM_DEVICE_PLAYBACK_MIXER(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_MIXER(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_MIXER(DISPLAY_PORT_RX_1, ``DISPLAY_PORT_RX_1'', ``MultiMedia1'', ``MultiMedia2'')
STREAM_DEVICE_PLAYBACK_ROUTE(WSA_CODEC_DMA_RX_0, ``WSA_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
STREAM_DEVICE_PLAYBACK_ROUTE(RX_CODEC_DMA_RX_0, ``RX_CODEC_DMA_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_0, ``DISPLAY_PORT_RX_0 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
STREAM_DEVICE_PLAYBACK_ROUTE(DISPLAY_PORT_RX_1, ``DISPLAY_PORT_RX_1 Audio Mixer'', ``MultiMedia1, stream0.logger1'', ``MultiMedia2, stream1.logger1'')
dnl STREAM_DEVICE_CAPTURE_MIXER(stream-index, kcontro1, kcontrol2... kcontrolN)
STREAM_DEVICE_CAPTURE_MIXER(FRONTEND_DAI_MULTIMEDIA3, ``VA_CODEC_DMA_TX_0'',``TX_CODEC_DMA_TX_3'' )
......
audioreach/subgraph-device-display-port-playback.m4
+ 1
− 1
View file @ f5b07e9f
......@@ -32,7 +32,7 @@ undefine(`CONT_STACK_SIZE') dnl
define(`DEVICE_PERF_MODE', APM_SG_PERF_MODE_LOW_LATENCY) dnl'
define(`DEVICE_DIRECTION', APM_SUB_GRAPH_DIRECTION_TX) dnl'
define(`CONT_SENARIO_ID', APM_SUB_GRAPH_SID_AUDIO_PLAYBACK) dnl'
define(`CONT_CAP', APM_CONTAINER_CAP_ID_EP) dnl'
define(`CONT_CAP', `ifelse(LPASS_VER_COMPAT, 110000, APM_CONTAINER_TYPE_ID_GC, APM_CONTAINER_CAP_ID_EP)') dnl'
define(`CONT_POSITION', APM_CONT_GRAPH_POS_STREAM)dnl'
define(`DEVICE_DOMAIN_ID', APM_PROC_DOMAIN_ID_ADSP) dnl'
define(`CONT_STACK_SIZE', 8192) dnl'
......
prebuilt/qcom/x1e80100/X1E80100-CRD-tplg.bin
+ 0
− 0
View file @ f5b07e9f
No preview for this file type
prebuilt/qcom/x1e80100/X1E80100-CRD.conf
+ 385
− 15
View file @ f5b07e9f
......@@ -1224,7 +1224,7 @@ SectionPCMCapabilities."MultiMedia4 Capture" {
rate_min "48000"
rate_max "48000"
channels_min "1"
channels_max "2"
channels_max "4"
}
SectionPCM."MultiMedia4 Capture" {
......@@ -1889,6 +1889,324 @@ SectionGraph."device113.1 RX_CODEC_DMA_RX_0 Graph" {
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
#
# SubGraph for Device Backend
#
# ______________________
# | Sub Graph |
# | [LOG] -> [DEVICE EP] |
# |______________________|
SectionVendorTuples."device104.sub_graph1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_SUB_GRAPH_INSTANCE_ID "0x00004012"
AR_TKN_DAI_INDEX "104"
AR_TKN_U32_SUB_GRAPH_PERF_MODE "0x2"
AR_TKN_U32_SUB_GRAPH_DIRECTION "0x1"
AR_TKN_U32_SUB_GRAPH_SCENARIO_ID "0x1"
}
}
SectionData."device104.sub_graph1_data" {
tuples "device104.sub_graph1_tuples"
}
SectionVendorTuples."device104.container1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_CONAINER_INSTANCE_ID "0x00004012"
AR_TKN_U32_CONAINER_CAPABILITY_ID "0x0B001001"
AR_TKN_U32_CONAINER_STACK_SIZE "8192"
AR_TKN_U32_CONAINER_GRAPH_POS "0x1"
AR_TKN_U32_CONAINER_PROC_DOMAIN "0x2"
}
}
SectionData."device104.container1_data" {
tuples "device104.container1_tuples"
}
SectionVendorTuples."device104.logger1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "0x00006120"
AR_TKN_U32_MODULE_ID "0x0700101A"
AR_TKN_U32_MODULE_MAX_IP_PORTS "1"
AR_TKN_U32_MODULE_MAX_OP_PORTS "1"
AR_TKN_U32_MODULE_IN_PORTS "2"
AR_TKN_U32_MODULE_OUT_PORTS "1"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "2"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "0x00006120"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "24865"
AR_TKN_U32_MODULE_LOG_CODE "0x000019ab"
AR_TKN_U32_MODULE_LOG_TAP_POINT_ID "1"
AR_TKN_U32_MODULE_LOG_MODE "0"
}
}
SectionData."device104.logger1_data" {
tuples "device104.logger1_tuples"
}
SectionWidget."device104.logger1" {
index "1"
type "buffer"
no_pm "true"
subseq "10"
data [
"device104.sub_graph1_data"
"device104.container1_data"
"device104.logger1_data"
]
}
SectionVendorTuples."device104.display_port_rx1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "24865"
AR_TKN_U32_MODULE_ID "0x07001069"
AR_TKN_U32_MODULE_MAX_IP_PORTS "1"
AR_TKN_U32_MODULE_MAX_OP_PORTS "0"
AR_TKN_U32_MODULE_IN_PORTS "2"
AR_TKN_U32_MODULE_OUT_PORTS "0"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "0"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "24865"
AR_TKN_U32_MODULE_FMT_DATA "1"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "0x0"
}
}
SectionData."device104.display_port_rx1_data" {
tuples "device104.display_port_rx1_tuples"
}
SectionWidget."device104.display_port_rx1" {
index "1"
type "aif_in"
no_pm "true"
stream_name "DISPLAY_PORT_RX_0 Playback"
subseq "10"
data [
"device104.sub_graph1_data"
"device104.container1_data"
"device104.display_port_rx1_data"
]
}
SectionGraph."device104.1 DISPLAY_PORT_RX_0 Graph" {
index "1"
lines [
"device104.logger1, , DISPLAY_PORT_RX_0 Audio Mixer"
"device104.display_port_rx1, , device104.logger1"
"DISPLAY_PORT_RX_0 Playback, , device104.display_port_rx1"
]
}
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
#
# SubGraph for Device Backend
#
# ______________________
# | Sub Graph |
# | [LOG] -> [DEVICE EP] |
# |______________________|
SectionVendorTuples."device129.sub_graph1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_SUB_GRAPH_INSTANCE_ID "0x00004013"
AR_TKN_DAI_INDEX "129"
AR_TKN_U32_SUB_GRAPH_PERF_MODE "0x2"
AR_TKN_U32_SUB_GRAPH_DIRECTION "0x1"
AR_TKN_U32_SUB_GRAPH_SCENARIO_ID "0x1"
}
}
SectionData."device129.sub_graph1_data" {
tuples "device129.sub_graph1_tuples"
}
SectionVendorTuples."device129.container1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_CONAINER_INSTANCE_ID "0x00004013"
AR_TKN_U32_CONAINER_CAPABILITY_ID "0x0B001001"
AR_TKN_U32_CONAINER_STACK_SIZE "8192"
AR_TKN_U32_CONAINER_GRAPH_POS "0x1"
AR_TKN_U32_CONAINER_PROC_DOMAIN "0x2"
}
}
SectionData."device129.container1_data" {
tuples "device129.container1_tuples"
}
SectionVendorTuples."device129.logger1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "0x00006130"
AR_TKN_U32_MODULE_ID "0x0700101A"
AR_TKN_U32_MODULE_MAX_IP_PORTS "1"
AR_TKN_U32_MODULE_MAX_OP_PORTS "1"
AR_TKN_U32_MODULE_IN_PORTS "2"
AR_TKN_U32_MODULE_OUT_PORTS "1"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "2"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "0x00006130"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "24881"
AR_TKN_U32_MODULE_LOG_CODE "0x000019ab"
AR_TKN_U32_MODULE_LOG_TAP_POINT_ID "1"
AR_TKN_U32_MODULE_LOG_MODE "0"
}
}
SectionData."device129.logger1_data" {
tuples "device129.logger1_tuples"
}
SectionWidget."device129.logger1" {
index "1"
type "buffer"
no_pm "true"
subseq "10"
data [
"device129.sub_graph1_data"
"device129.container1_data"
"device129.logger1_data"
]
}
SectionVendorTuples."device129.display_port_rx1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "24881"
AR_TKN_U32_MODULE_ID "0x07001069"
AR_TKN_U32_MODULE_MAX_IP_PORTS "1"
AR_TKN_U32_MODULE_MAX_OP_PORTS "0"
AR_TKN_U32_MODULE_IN_PORTS "2"
AR_TKN_U32_MODULE_OUT_PORTS "0"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "0"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "24881"
AR_TKN_U32_MODULE_FMT_DATA "1"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "0x0"
}
}
SectionData."device129.display_port_rx1_data" {
tuples "device129.display_port_rx1_tuples"
}
SectionWidget."device129.display_port_rx1" {
index "1"
type "aif_in"
no_pm "true"
stream_name "DISPLAY_PORT_RX_1 Playback"
subseq "10"
data [
"device129.sub_graph1_data"
"device129.container1_data"
"device129.display_port_rx1_data"
]
}
SectionGraph."device129.1 DISPLAY_PORT_RX_1 Graph" {
index "1"
lines [
"device129.logger1, , DISPLAY_PORT_RX_1 Audio Mixer"
"device129.display_port_rx1, , device129.logger1"
"DISPLAY_PORT_RX_1 Playback, , device129.display_port_rx1"
]
}
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
# Copyright, Linaro Ltd, 2023
# SPDX-License-Identifier: BSD-3-Clause
......@@ -1914,7 +2232,7 @@ SectionGraph."device113.1 RX_CODEC_DMA_RX_0 Graph" {
SectionVendorTuples."device110.sub_graph1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_SUB_GRAPH_INSTANCE_ID "0x00004008"
AR_TKN_U32_SUB_GRAPH_INSTANCE_ID "0x00004018"
AR_TKN_DAI_INDEX "110"
AR_TKN_U32_SUB_GRAPH_PERF_MODE "0x2"
AR_TKN_U32_SUB_GRAPH_DIRECTION "0x1"
......@@ -1930,7 +2248,7 @@ SectionData."device110.sub_graph1_data" {
SectionVendorTuples."device110.container1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_CONAINER_INSTANCE_ID "0x00004008"
AR_TKN_U32_CONAINER_INSTANCE_ID "0x00004018"
AR_TKN_U32_CONAINER_CAPABILITY_ID "0x0B001001"
AR_TKN_U32_CONAINER_STACK_SIZE "8192"
AR_TKN_U32_CONAINER_GRAPH_POS "0x4"
......@@ -1947,7 +2265,7 @@ SectionVendorTuples."device110.codec_dma_tx1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "0x00006080"
AR_TKN_U32_MODULE_INSTANCE_ID "0x00006180"
AR_TKN_U32_MODULE_ID "0x07001024"
AR_TKN_U32_MODULE_MAX_IP_PORTS "0"
AR_TKN_U32_MODULE_MAX_OP_PORTS "1"
......@@ -1955,8 +2273,8 @@ SectionVendorTuples."device110.codec_dma_tx1_tuples" {
AR_TKN_U32_MODULE_OUT_PORTS "2"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "2"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "0x00006080"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "24705"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "0x00006180"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "24961"
AR_TKN_U32_MODULE_HW_IF_TYPE "3"
AR_TKN_U32_MODULE_HW_IF_IDX "1"
AR_TKN_U32_MODULE_FMT_DATA "1"
......@@ -1984,7 +2302,7 @@ SectionVendorTuples."device110.logger1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "24705"
AR_TKN_U32_MODULE_INSTANCE_ID "24961"
AR_TKN_U32_MODULE_ID "0x0700101A"
AR_TKN_U32_MODULE_MAX_IP_PORTS "1"
AR_TKN_U32_MODULE_MAX_OP_PORTS "1"
......@@ -1992,7 +2310,7 @@ SectionVendorTuples."device110.logger1_tuples" {
AR_TKN_U32_MODULE_OUT_PORTS "1"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "2"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "24705"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "24961"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "0x0"
AR_TKN_U32_MODULE_LOG_CODE "0x000019ab"
AR_TKN_U32_MODULE_LOG_TAP_POINT_ID "1"
......@@ -2095,7 +2413,7 @@ SectionGraph."device110.1 VA_CODEC_DMA_TX_0 Graph" {
SectionVendorTuples."device120.sub_graph1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_SUB_GRAPH_INSTANCE_ID "0x00004009"
AR_TKN_U32_SUB_GRAPH_INSTANCE_ID "0x00004019"
AR_TKN_DAI_INDEX "120"
AR_TKN_U32_SUB_GRAPH_PERF_MODE "0x2"
AR_TKN_U32_SUB_GRAPH_DIRECTION "0x1"
......@@ -2111,7 +2429,7 @@ SectionData."device120.sub_graph1_data" {
SectionVendorTuples."device120.container1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_CONAINER_INSTANCE_ID "0x00004009"
AR_TKN_U32_CONAINER_INSTANCE_ID "0x00004019"
AR_TKN_U32_CONAINER_CAPABILITY_ID "0x0B001001"
AR_TKN_U32_CONAINER_STACK_SIZE "8192"
AR_TKN_U32_CONAINER_GRAPH_POS "0x4"
......@@ -2128,7 +2446,7 @@ SectionVendorTuples."device120.codec_dma_tx1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "0x00006090"
AR_TKN_U32_MODULE_INSTANCE_ID "0x00006190"
AR_TKN_U32_MODULE_ID "0x07001024"
AR_TKN_U32_MODULE_MAX_IP_PORTS "0"
AR_TKN_U32_MODULE_MAX_OP_PORTS "1"
......@@ -2136,8 +2454,8 @@ SectionVendorTuples."device120.codec_dma_tx1_tuples" {
AR_TKN_U32_MODULE_OUT_PORTS "2"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "2"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "0x00006090"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "24721"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "0x00006190"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "24977"
AR_TKN_U32_MODULE_HW_IF_TYPE "1"
AR_TKN_U32_MODULE_HW_IF_IDX "4"
AR_TKN_U32_MODULE_FMT_DATA "1"
......@@ -2165,7 +2483,7 @@ SectionVendorTuples."device120.logger1_tuples" {
tokens "audioreach_tokens"
tuples."word.u32_data" {
AR_TKN_U32_MODULE_INSTANCE_ID "24721"
AR_TKN_U32_MODULE_INSTANCE_ID "24977"
AR_TKN_U32_MODULE_ID "0x0700101A"
AR_TKN_U32_MODULE_MAX_IP_PORTS "1"
AR_TKN_U32_MODULE_MAX_OP_PORTS "1"
......@@ -2173,7 +2491,7 @@ SectionVendorTuples."device120.logger1_tuples" {
AR_TKN_U32_MODULE_OUT_PORTS "1"
AR_TKN_U32_MODULE_SRC_OP_PORT_ID "1"
AR_TKN_U32_MODULE_DST_IN_PORT_ID "2"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "24721"
AR_TKN_U32_MODULE_SRC_INSTANCE_ID "24977"
AR_TKN_U32_MODULE_DST_INSTANCE_ID "0x0"
AR_TKN_U32_MODULE_LOG_CODE "0x000019ab"
AR_TKN_U32_MODULE_LOG_TAP_POINT_ID "1"
......@@ -2261,6 +2579,38 @@ SectionWidget."RX_CODEC_DMA_RX_0 Audio Mixer" {
]
}
SectionWidget."DISPLAY_PORT_RX_0 Audio Mixer" {
reg "-1"
index "104"
type "mixer"
mixer [
MultiMedia2
MultiMedia1
]
data [
"device104.sub_graph1_data"
]
}
SectionWidget."DISPLAY_PORT_RX_1 Audio Mixer" {
reg "-1"
index "129"
type "mixer"
mixer [
MultiMedia2
MultiMedia1
]
data [
"device129.sub_graph1_data"
]
}
SectionGraph."WSA_CODEC_DMA_RX_0 Audio Mixer Graph" {
......@@ -2283,6 +2633,26 @@ SectionGraph."RX_CODEC_DMA_RX_0 Audio Mixer Graph" {
}
SectionGraph."DISPLAY_PORT_RX_0 Audio Mixer Graph" {
index "104"
lines [
"DISPLAY_PORT_RX_0 Audio Mixer, MultiMedia2, stream1.logger1"
"DISPLAY_PORT_RX_0 Audio Mixer, MultiMedia1, stream0.logger1"
]
}
SectionGraph."DISPLAY_PORT_RX_1 Audio Mixer Graph" {
index "129"
lines [
"DISPLAY_PORT_RX_1 Audio Mixer, MultiMedia2, stream1.logger1"
"DISPLAY_PORT_RX_1 Audio Mixer, MultiMedia1, stream0.logger1"
]
}
SectionWidget."MultiMedia3 Mixer" {
reg "-1"
index "2"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment