Skip to content
This repository was archived by the owner on Jan 17, 2019. It is now read-only.

Commit 4c9e3dd

Browse files
committed
topology: Add 3 HDMI/DP PCMs and backends for GLK
Define 3 new PCMs and backends for HDMI/DP playback on GLK platform. Here are the updated pipelines in sof-glk-da7219.m4: PCM0 ----> volume (pipe 1) ---> SSP1 (speaker - maxim98357a, BE link 0) PCM1 <---> volume (pipe 2,3) <--> SSP2 (headset - da7219, BE link 1) PCM99 <---- volume (pipe 4) <--- DMIC0 (dmic capture, BE link 2) PCM5 ----> volume (pipe 5) ---> iDisp1 (HDMI/DP playback, BE link 3) PCM6 ----> Volume (pipe 6) ---> iDisp2 (HDMI/DP playback, BE link 4) PCM7 ----> volume (pipe 7) ---> iDisp3 (HDMI/DP playback, BE link 5) There is also support for changing HDMI/DP pipelines to pass-through for validation purpose, which is commented off by default. Pleaes note that 3 virtual widgets hifi1~3 are removed, because they'll be created by HDMI codec driver. This m4 was verified on GLK platform.
1 parent d272119 commit 4c9e3dd

1 file changed

Lines changed: 58 additions & 7 deletions

File tree

topology/sof-glk-da7219.m4

Lines changed: 58 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ include(`utils.m4')
77
include(`dai.m4')
88
include(`pipeline.m4')
99
include(`ssp.m4')
10+
include(`hda.m4')
1011

1112
# Include TLV library
1213
include(`common/tlv.m4')
@@ -21,9 +22,12 @@ include(`platform/intel/dmic.m4')
2122
#
2223
# Define the pipelines
2324
#
24-
# PCM0 ----> volume -----> SSP1 (speaker - maxim98357a)
25-
# PCM1 <---> volume <----> SSP2 (headset - da7219)
26-
# PCM99 <---- volume <----- DMIC0 (dmic capture)
25+
# PCM0 ----> volume (pipe 1) -----> SSP1 (speaker - maxim98357a, BE link 0)
26+
# PCM1 <---> volume (pipe 2,3) <----> SSP2 (headset - da7219, BE link 1)
27+
# PCM99 <---- volume (pipe 4) <----- DMIC0 (dmic capture, BE link 2)
28+
# PCM5 ----> volume (pipe 5) -----> iDisp1 (HDMI/DP playback, BE link 3)
29+
# PCM6 ----> Volume (pipe 6) -----> iDisp2 (HDMI/DP playback, BE link 4)
30+
# PCM7 ----> volume (pipe 7) -----> iDisp3 (HDMI/DP playback, BE link 5)
2731
#
2832

2933
# Low Latency playback pipeline 1 on PCM 0 using max 2 channels of s32le.
@@ -44,13 +48,34 @@ PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
4448
3, 1, 2, s32le,
4549
48, 1000, 0, 0)
4650

47-
# Low Latency capture pipeline 4 on PCM 0 using max 4 channels of s32le.
51+
# Low Latency capture pipeline 4 on PCM 99 using max 4 channels of s32le.
4852
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
4953
#PIPELINE_PCM_ADD(sof/pipe-volume-capture.m4,
5054
PIPELINE_PCM_ADD(sof/pipe-passthrough-capture.m4,
5155
4, 99, 4, s32le,
5256
48, 1000, 0, 0)
5357

58+
# Low Latency playback pipeline 5 on PCM 5 using max 2 channels of s16le.
59+
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
60+
# PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
61+
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
62+
5, 5, 2, s16le,
63+
48, 1000, 0, 0)
64+
65+
# Low Latency playback pipeline 6 on PCM 6 using max 2 channels of s16le.
66+
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
67+
# PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
68+
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
69+
6, 6, 2, s16le,
70+
48, 1000, 0, 0)
71+
72+
# Low Latency playback pipeline 7 on PCM 7 using max 2 channels of s16le.
73+
# Schedule 48 frames per 1000us deadline on core 0 with priority 0
74+
# PIPELINE_PCM_ADD(sof/pipe-passthrough-playback.m4,
75+
PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
76+
7, 7, 2, s16le,
77+
48, 1000, 0, 0)
78+
5479
#
5580
# DAIs configuration
5681
#
@@ -83,9 +108,33 @@ DAI_ADD(sof/pipe-dai-capture.m4,
83108
PIPELINE_SINK_4, 2, s32le,
84109
48, 1000, 0, 0)
85110

111+
# playback DAI is iDisp1 using 2 periods
112+
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
113+
DAI_ADD(sof/pipe-dai-playback.m4,
114+
5, HDA, 3, iDisp1,
115+
PIPELINE_SOURCE_5, 2, s16le,
116+
48, 1000, 0, 0)
117+
118+
# playback DAI is iDisp2 using 2 periods
119+
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
120+
DAI_ADD(sof/pipe-dai-playback.m4,
121+
6, HDA, 4, iDisp2,
122+
PIPELINE_SOURCE_6, 2, s16le,
123+
48, 1000, 0, 0)
124+
125+
# playback DAI is iDisp3 using 2 periods
126+
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
127+
DAI_ADD(sof/pipe-dai-playback.m4,
128+
7, HDA, 5, iDisp3,
129+
PIPELINE_SOURCE_7, 2, s16le,
130+
48, 1000, 0, 0)
131+
86132
PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1)
87133
PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)
88134
PCM_CAPTURE_ADD(DMIC01, 99, PIPELINE_PCM_4)
135+
PCM_PLAYBACK_ADD(HDMI1, 5, PIPELINE_PCM_5)
136+
PCM_PLAYBACK_ADD(HDMI2, 6, PIPELINE_PCM_6)
137+
PCM_PLAYBACK_ADD(HDMI3, 7, PIPELINE_PCM_7)
89138

90139
#
91140
# BE configurations - overrides config in ACPI if present
@@ -115,6 +164,11 @@ DAI_CONFIG(DMIC, 0, 2, dmic01,
115164
# PDM_CONFIG(DMIC, 0, FOUR_CH_PDM0_PDM1)))
116165
PDM_CONFIG(DMIC, 0, STEREO_PDM0)))
117166

167+
# 3 HDMI/DP outputs (ID: 3,4,5)
168+
HDA_DAI_CONFIG(3, 3, iDisp1)
169+
HDA_DAI_CONFIG(4, 4, iDisp2)
170+
HDA_DAI_CONFIG(5, 5, iDisp3)
171+
118172
## remove warnings with SST hard-coded routes (FIXME)
119173

120174
VIRTUAL_WIDGET(ssp5 Tx, 0)
@@ -126,9 +180,6 @@ VIRTUAL_WIDGET(dmic01_hifi, 5)
126180
VIRTUAL_WIDGET(hif5-0 Output, 6)
127181
VIRTUAL_WIDGET(hif6-0 Output, 7)
128182
VIRTUAL_WIDGET(hif7-0 Output, 8)
129-
VIRTUAL_WIDGET(hifi1, 9)
130-
VIRTUAL_WIDGET(hifi2, 10)
131-
VIRTUAL_WIDGET(hifi3, 11)
132183

133184
VIRTUAL_DAPM_ROUTE_OUT(codec0_out, SSP, 0, OUT, 12)
134185
VIRTUAL_DAPM_ROUTE_OUT(codec1_out, SSP, 0, OUT, 13)

0 commit comments

Comments
 (0)