Skip to content

Commit 55ae67b

Browse files
tlaudaakloniex
tlauda
authored and
akloniex
committed
topology: update all HDA pipelines to use timer
Updates all HDA pipelines in topologies to use timer as a scheduling source. Signed-off-by: Tomasz Lauda <tomasz.lauda@linux.intel.com>
1 parent 71a2e10 commit 55ae67b

8 files changed

Lines changed: 28 additions & 28 deletions

‎tools/topology/sof-apl-da7219.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,21 @@ DAI_ADD(sof/pipe-dai-capture.m4,
112112
DAI_ADD(sof/pipe-dai-playback.m4,
113113
5, HDA, 3, iDisp1,
114114
PIPELINE_SOURCE_5, 2, s32le,
115-
48, 1000, 0, 0)
115+
48, 1000, 0, 0, 1000)
116116

117117
# playback DAI is iDisp2 using 2 periods
118118
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
119119
DAI_ADD(sof/pipe-dai-playback.m4,
120120
6, HDA, 4, iDisp2,
121121
PIPELINE_SOURCE_6, 2, s32le,
122-
48, 1000, 0, 0)
122+
48, 1000, 0, 0, 1000)
123123

124124
# playback DAI is iDisp3 using 2 periods
125125
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
126126
DAI_ADD(sof/pipe-dai-playback.m4,
127127
7, HDA, 5, iDisp3,
128128
PIPELINE_SOURCE_7, 2, s32le,
129-
48, 1000, 0, 0)
129+
48, 1000, 0, 0, 1000)
130130

131131
PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1)
132132
PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)

‎tools/topology/sof-apl-pcm512x.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,21 +77,21 @@ DAI_ADD(sof/pipe-dai-playback.m4,
7777
DAI_ADD(sof/pipe-dai-playback.m4,
7878
2, HDA, 0, iDisp1,
7979
PIPELINE_SOURCE_2, 2, s32le,
80-
48, 1000, 0, 0)
80+
48, 1000, 0, 0, 1000)
8181

8282
# playback DAI is iDisp2 using 2 periods
8383
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
8484
DAI_ADD(sof/pipe-dai-playback.m4,
8585
3, HDA, 1, iDisp2,
8686
PIPELINE_SOURCE_3, 2, s32le,
87-
48, 1000, 0, 0)
87+
48, 1000, 0, 0, 1000)
8888

8989
# playback DAI is iDisp3 using 2 periods
9090
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
9191
DAI_ADD(sof/pipe-dai-playback.m4,
9292
4, HDA, 2, iDisp3,
9393
PIPELINE_SOURCE_4, 2, s32le,
94-
48, 1000, 0, 0)
94+
48, 1000, 0, 0, 1000)
9595

9696
# PCM Low Latency, id 0
9797
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)

‎tools/topology/sof-apl-rt298.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -65,21 +65,21 @@ DAI_ADD(sof/pipe-dai-playback.m4,
6565
DAI_ADD(sof/pipe-dai-playback.m4,
6666
5, HDA, 3, iDisp1,
6767
PIPELINE_SOURCE_5, 2, s32le,
68-
48, 1000, 0, 0)
68+
48, 1000, 0, 0, 1000)
6969

7070
# playback DAI is iDisp2 using 2 periods
7171
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
7272
DAI_ADD(sof/pipe-dai-playback.m4,
7373
6, HDA, 4, iDisp2,
7474
PIPELINE_SOURCE_6, 2, s32le,
75-
48, 1000, 0, 0)
75+
48, 1000, 0, 0, 1000)
7676

7777
# playback DAI is iDisp3 using 2 periods
7878
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
7979
DAI_ADD(sof/pipe-dai-playback.m4,
8080
7, HDA, 5, iDisp3,
8181
PIPELINE_SOURCE_7, 2, s32le,
82-
48, 1000, 0, 0)
82+
48, 1000, 0, 0, 1000)
8383

8484
# PCM Low Latency, id 0
8585
PCM_PLAYBACK_ADD(Port5, 0, PIPELINE_PCM_1)

‎tools/topology/sof-cml-rt5682.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,21 @@ DAI_ADD(sof/pipe-dai-capture.m4,
112112
DAI_ADD(sof/pipe-dai-playback.m4,
113113
4, HDA, 0, iDisp1,
114114
PIPELINE_SOURCE_4, 2, s32le,
115-
48, 1000, 0, 0)
115+
48, 1000, 0, 0, 1000)
116116

117117
# playback DAI is iDisp2 using 2 periods
118118
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
119119
DAI_ADD(sof/pipe-dai-playback.m4,
120120
5, HDA, 1, iDisp2,
121121
PIPELINE_SOURCE_5, 2, s32le,
122-
48, 1000, 0, 0)
122+
48, 1000, 0, 0, 1000)
123123

124124
# playback DAI is iDisp3 using 2 periods
125125
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
126126
DAI_ADD(sof/pipe-dai-playback.m4,
127127
6, HDA, 2, iDisp3,
128128
PIPELINE_SOURCE_6, 2, s32le,
129-
48, 1000, 0, 0)
129+
48, 1000, 0, 0, 1000)
130130

131131
# PCM Low Latency, id 0
132132
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)

‎tools/topology/sof-cml-src-rt5682.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -106,21 +106,21 @@ DAI_ADD(sof/pipe-dai-capture.m4,
106106
DAI_ADD(sof/pipe-dai-playback.m4,
107107
4, HDA, 0, iDisp1,
108108
PIPELINE_SOURCE_4, 2, s32le,
109-
48, 1000, 0, 0)
109+
48, 1000, 0, 0, 1000)
110110

111111
# playback DAI is iDisp2 using 2 periods
112112
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
113113
DAI_ADD(sof/pipe-dai-playback.m4,
114114
5, HDA, 1, iDisp2,
115115
PIPELINE_SOURCE_5, 2, s32le,
116-
48, 1000, 0, 0)
116+
48, 1000, 0, 0, 1000)
117117

118118
# playback DAI is iDisp3 using 2 periods
119119
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
120120
DAI_ADD(sof/pipe-dai-playback.m4,
121121
6, HDA, 2, iDisp3,
122122
PIPELINE_SOURCE_6, 2, s32le,
123-
48, 1000, 0, 0)
123+
48, 1000, 0, 0, 1000)
124124

125125
# PCM Low Latency, id 0
126126
dnl PCM_PLAYBACK_ADD(name, pcm_id, playback)

‎tools/topology/sof-glk-da7219.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -112,21 +112,21 @@ DAI_ADD(sof/pipe-dai-capture.m4,
112112
DAI_ADD(sof/pipe-dai-playback.m4,
113113
5, HDA, 3, iDisp1,
114114
PIPELINE_SOURCE_5, 2, s32le,
115-
48, 1000, 0, 0)
115+
48, 1000, 0, 0, 1000)
116116

117117
# playback DAI is iDisp2 using 2 periods
118118
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
119119
DAI_ADD(sof/pipe-dai-playback.m4,
120120
6, HDA, 4, iDisp2,
121121
PIPELINE_SOURCE_6, 2, s32le,
122-
48, 1000, 0, 0)
122+
48, 1000, 0, 0, 1000)
123123

124124
# playback DAI is iDisp3 using 2 periods
125125
# Buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
126126
DAI_ADD(sof/pipe-dai-playback.m4,
127127
7, HDA, 5, iDisp3,
128128
PIPELINE_SOURCE_7, 2, s32le,
129-
48, 1000, 0, 0)
129+
48, 1000, 0, 0, 1000)
130130

131131
PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1)
132132
PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)

‎tools/topology/sof-glk-rt5682.m4‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,21 +115,21 @@ DAI_ADD(sof/pipe-dai-capture.m4,
115115
DAI_ADD(sof/pipe-dai-playback.m4,
116116
5, HDA, 3, iDisp1,
117117
PIPELINE_SOURCE_5, 2, s16le,
118-
48, 1000, 0, 0)
118+
48, 1000, 0, 0, 1000)
119119

120120
# playback DAI is iDisp2 using 2 periods
121121
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
122122
DAI_ADD(sof/pipe-dai-playback.m4,
123123
6, HDA, 4, iDisp2,
124124
PIPELINE_SOURCE_6, 2, s16le,
125-
48, 1000, 0, 0)
125+
48, 1000, 0, 0, 1000)
126126

127127
# playback DAI is iDisp3 using 2 periods
128128
# Buffers use s16le format, with 48 frame per 1000us on core 0 with priority 0
129129
DAI_ADD(sof/pipe-dai-playback.m4,
130130
7, HDA, 5, iDisp3,
131131
PIPELINE_SOURCE_7, 2, s16le,
132-
48, 1000, 0, 0)
132+
48, 1000, 0, 0, 1000)
133133

134134
PCM_PLAYBACK_ADD(Speakers, 0, PIPELINE_PCM_1)
135135
PCM_DUPLEX_ADD(Headset, 1, PIPELINE_PCM_2, PIPELINE_PCM_3)

‎tools/topology/sof-hda-intel-common.m4‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -77,49 +77,49 @@ PIPELINE_PCM_ADD(sof/pipe-volume-playback.m4,
7777
DAI_ADD(sof/pipe-dai-playback.m4,
7878
1, HDA, 0, Analog Playback and Capture,
7979
PIPELINE_SOURCE_1, 2, s32le,
80-
48, 1000, 0, 0)
80+
48, 1000, 0, 0, 1000)
8181

8282
# capture DAI is HDA Analog using 2 periods
8383
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
8484
DAI_ADD(sof/pipe-dai-capture.m4,
8585
2, HDA, 1, Analog Playback and Capture,
8686
PIPELINE_SINK_2, 2, s32le,
87-
48, 1000, 0, 0)
87+
48, 1000, 0, 0, 1000)
8888

8989
# playback DAI is HDA Digital using 2 periods
9090
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
9191
DAI_ADD(sof/pipe-dai-playback.m4,
9292
3, HDA, 2, Digital Playback and Capture,
9393
PIPELINE_SOURCE_3, 2, s32le,
94-
48, 1000, 0, 0)
94+
48, 1000, 0, 0, 1000)
9595

9696
# capture DAI is HDA Digital using 2 periods
9797
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
9898
DAI_ADD(sof/pipe-dai-capture.m4,
9999
4, HDA, 3, Digital Playback and Capture,
100100
PIPELINE_SINK_4, 2, s32le,
101-
48, 1000, 0, 0)
101+
48, 1000, 0, 0, 1000)
102102

103103
# playback DAI is iDisp1 using 2 periods
104104
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
105105
DAI_ADD(sof/pipe-dai-playback.m4,
106106
7, HDA, 4, iDisp1,
107107
PIPELINE_SOURCE_7, 2, s32le,
108-
48, 1000, 0, 0)
108+
48, 1000, 0, 0, 1000)
109109

110110
# playback DAI is iDisp2 using 2 periods
111111
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
112112
DAI_ADD(sof/pipe-dai-playback.m4,
113113
8, HDA, 5, iDisp2,
114114
PIPELINE_SOURCE_8, 2, s32le,
115-
48, 1000, 0, 0)
115+
48, 1000, 0, 0, 1000)
116116

117117
# playback DAI is iDisp3 using 2 periods
118118
# Dai buffers use s32le format, with 48 frame per 1000us on core 0 with priority 0
119119
DAI_ADD(sof/pipe-dai-playback.m4,
120120
9, HDA, 6, iDisp3,
121121
PIPELINE_SOURCE_9, 2, s32le,
122-
48, 1000, 0, 0)
122+
48, 1000, 0, 0, 1000)
123123

124124
PCM_DUPLEX_ADD(HDA Analog, 0, PIPELINE_PCM_1, PIPELINE_PCM_2)
125125
PCM_DUPLEX_ADD(HDA Digital, 1, PIPELINE_PCM_3, PIPELINE_PCM_4)

0 commit comments

Comments
 (0)