Skip to content

Commit 362a078

Browse files
ranj063kv2019i
ranj063
authored and
kv2019i
committed
topology2: Remove dma_buffer_size attribute
There's been a recent kernel change to compute the DMA buffer size using the ibs/obs. So this attribute no longer needs to be set in the topology. Signed-off-by: Ranjani Sridharan <ranjani.sridharan@linux.intel.com>
1 parent 2de0b86 commit 362a078

33 files changed

+1
-157
lines changed

‎tools/topology/topology2/cavs-mixin-mixout-efx-hda.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ Object.Pipeline {
9696
in_valid_bit_depth 32
9797
out_bit_depth 32
9898
out_valid_bit_depth 32
99-
dma_buffer_size "$[$ibs * 2]"
10099
}
101100
}
102101
}

‎tools/topology/topology2/cavs-mixin-mixout-hda.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,6 @@ Object.Pipeline {
8686
in_valid_bit_depth 32
8787
out_bit_depth 32
8888
out_valid_bit_depth 32
89-
dma_buffer_size "$[$ibs * 2]"
9089
}
9190
}
9291
Object.Widget.eqiir.1 {

‎tools/topology/topology2/cavs-nocodec-bt.conf‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,6 @@ Object.Pipeline {
209209
in_valid_bit_depth 32
210210
out_bit_depth 32
211211
out_valid_bit_depth 32
212-
dma_buffer_size "$[$ibs * 2]"
213212
}
214213
}
215214
}
@@ -232,7 +231,6 @@ Object.Pipeline {
232231
in_valid_bit_depth 32
233232
out_bit_depth 32
234233
out_valid_bit_depth 32
235-
dma_buffer_size "$[$ibs * 2]"
236234
}
237235
}
238236
}

‎tools/topology/topology2/cavs-nocodec.conf‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,6 @@ Object.Pipeline.gain-module-copier [
278278
in_valid_bit_depth 32
279279
out_bit_depth 32
280280
out_valid_bit_depth 32
281-
dma_buffer_size "$[$ibs * 2]"
282281
}
283282
Object.Base.audio_format.2 {
284283
in_channels 4
@@ -287,7 +286,6 @@ Object.Pipeline.gain-module-copier [
287286
out_channels 4
288287
out_bit_depth 32
289288
out_valid_bit_depth 32
290-
dma_buffer_size "$[$ibs * 2]"
291289
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
292290
in_ch_map $CHANNEL_MAP_3_POINT_1
293291
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
@@ -303,7 +301,6 @@ Object.Pipeline.gain-module-copier [
303301
in_valid_bit_depth 32
304302
out_bit_depth 32
305303
out_valid_bit_depth 32
306-
dma_buffer_size "$[$ibs * 2]"
307304
}
308305
Object.Base.audio_format.2 {
309306
in_channels 4
@@ -312,7 +309,6 @@ Object.Pipeline.gain-module-copier [
312309
out_channels 4
313310
out_bit_depth 32
314311
out_valid_bit_depth 32
315-
dma_buffer_size "$[$ibs * 2]"
316312
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
317313
in_ch_map $CHANNEL_MAP_3_POINT_1
318314
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
@@ -340,7 +336,6 @@ Object.Pipeline.dai-copier-gain-module-copier-capture [
340336
in_valid_bit_depth 32
341337
out_bit_depth 32
342338
out_valid_bit_depth 32
343-
dma_buffer_size "$[$ibs * 2]"
344339
}
345340

346341
Object.Base.output_pin_binding.1 {
@@ -359,7 +354,6 @@ Object.Pipeline.dai-copier-gain-module-copier-capture [
359354
in_valid_bit_depth 32
360355
out_bit_depth 32
361356
out_valid_bit_depth 32
362-
dma_buffer_size "$[$ibs * 2]"
363357
}
364358
}
365359
Object.Widget.gain.1 {
@@ -397,7 +391,6 @@ Object.Pipeline.passthrough-capture-be [
397391
in_valid_bit_depth 32
398392
out_bit_depth 32
399393
out_valid_bit_depth 32
400-
dma_buffer_size "$[$ibs * 2]"
401394
}
402395
}
403396
}
@@ -417,7 +410,6 @@ Object.Pipeline.passthrough-capture-be [
417410
in_valid_bit_depth 32
418411
out_bit_depth 32
419412
out_valid_bit_depth 32
420-
dma_buffer_size "$[$ibs * 2]"
421413
}
422414
}
423415
}
@@ -440,7 +432,6 @@ Object.Pipeline.gain-capture [
440432
in_valid_bit_depth 32
441433
out_bit_depth 32
442434
out_valid_bit_depth 32
443-
dma_buffer_size "$[$ibs * 2]"
444435
}
445436
Object.Base.audio_format.2 {
446437
in_channels 4
@@ -449,7 +440,6 @@ Object.Pipeline.gain-capture [
449440
out_channels 4
450441
out_bit_depth 32
451442
out_valid_bit_depth 32
452-
dma_buffer_size "$[$ibs * 2]"
453443
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
454444
in_ch_map $CHANNEL_MAP_3_POINT_1
455445
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
@@ -465,7 +455,6 @@ Object.Pipeline.gain-capture [
465455
in_valid_bit_depth 32
466456
out_bit_depth 32
467457
out_valid_bit_depth 32
468-
dma_buffer_size "$[$ibs * 2]"
469458
}
470459
Object.Base.audio_format.2 {
471460
in_channels 4
@@ -474,7 +463,6 @@ Object.Pipeline.gain-capture [
474463
out_channels 4
475464
out_bit_depth 32
476465
out_valid_bit_depth 32
477-
dma_buffer_size "$[$ibs * 2]"
478466
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
479467
in_ch_map $CHANNEL_MAP_3_POINT_1
480468
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
@@ -501,7 +489,6 @@ Object.Pipeline.gain-capture [
501489
in_valid_bit_depth 32
502490
out_bit_depth 32
503491
out_valid_bit_depth 32
504-
dma_buffer_size "$[$ibs * 2]"
505492
}
506493
Object.Base.audio_format.2 {
507494
in_channels 4
@@ -510,7 +497,6 @@ Object.Pipeline.gain-capture [
510497
out_channels 4
511498
out_bit_depth 32
512499
out_valid_bit_depth 32
513-
dma_buffer_size "$[$ibs * 2]"
514500
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
515501
in_ch_map $CHANNEL_MAP_3_POINT_1
516502
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1
@@ -526,7 +512,6 @@ Object.Pipeline.gain-capture [
526512
in_valid_bit_depth 32
527513
out_bit_depth 32
528514
out_valid_bit_depth 32
529-
dma_buffer_size "$[$ibs * 2]"
530515
}
531516
Object.Base.audio_format.2 {
532517
in_channels 4
@@ -535,7 +520,6 @@ Object.Pipeline.gain-capture [
535520
out_channels 4
536521
out_bit_depth 32
537522
out_valid_bit_depth 32
538-
dma_buffer_size "$[$ibs * 2]"
539523
in_ch_cfg $CHANNEL_CONFIG_3_POINT_1
540524
in_ch_map $CHANNEL_MAP_3_POINT_1
541525
out_ch_cfg $CHANNEL_CONFIG_3_POINT_1

‎tools/topology/topology2/cavs-rt5682.conf‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,6 @@ Object.Pipeline {
275275
in_valid_bit_depth 32
276276
out_bit_depth 32
277277
out_valid_bit_depth 32
278-
dma_buffer_size "$[$ibs * 2]"
279278
}
280279
}
281280
}
@@ -297,7 +296,6 @@ Object.Pipeline {
297296
in_valid_bit_depth 32
298297
out_bit_depth 32
299298
out_valid_bit_depth 32
300-
dma_buffer_size "$[$ibs * 2]"
301299
}
302300
Object.Base.audio_format.2 {
303301
in_channels 4
@@ -306,7 +304,6 @@ Object.Pipeline {
306304
out_channels 4
307305
out_bit_depth 32
308306
out_valid_bit_depth 32
309-
dma_buffer_size "$[$ibs * 2]"
310307
in_ch_cfg $CHANNEL_CONFIG_QUATRO
311308
in_ch_map $CHANNEL_MAP_3_POINT_1
312309
out_ch_cfg $CHANNEL_CONFIG_QUATRO
@@ -320,7 +317,6 @@ Object.Pipeline {
320317
in_valid_bit_depth 32
321318
out_bit_depth 32
322319
out_valid_bit_depth 32
323-
dma_buffer_size "$[$ibs * 2]"
324320
}
325321
Object.Base.audio_format.2 {
326322
in_channels 4
@@ -329,7 +325,6 @@ Object.Pipeline {
329325
out_channels 4
330326
out_bit_depth 32
331327
out_valid_bit_depth 32
332-
dma_buffer_size "$[$ibs * 2]"
333328
in_ch_cfg $CHANNEL_CONFIG_QUATRO
334329
in_ch_map $CHANNEL_MAP_3_POINT_1
335330
out_ch_cfg $CHANNEL_CONFIG_QUATRO

‎tools/topology/topology2/cavs-src-mixin-mixout-hda.conf‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@ Object.Pipeline {
8989
in_valid_bit_depth 32
9090
out_bit_depth 32
9191
out_valid_bit_depth 32
92-
dma_buffer_size "$[$ibs * 2]"
9392
}
9493
}
9594
}

‎tools/topology/topology2/include/common/audio_format.conf‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,6 @@ Class.Base."audio_format" {
193193
}
194194
}
195195

196-
DefineAttribute."dma_buffer_size" {
197-
# Token set reference name and type
198-
token_ref "sof_tkn_cavs_audio_format.word"
199-
}
200196

201197
attributes {
202198
!constructor [

‎tools/topology/topology2/include/common/tokens.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Object.Base.VendorToken {
170170
# tokens up to 1969 reserved for future use
171171
ibs 1970
172172
obs 1971
173-
dma_buffer_size 1972
173+
dma_buffer_size 1972 #deprecated
174174
}
175175

176176
# ABI 4.0 onwards

0 commit comments

Comments
 (0)