Topology2: Add sof-hda-generic sereies topologies for DAX #10472
Conversation
|
Can one of the admins verify this patch?
|
|
test this please |
tools/topology/topology2/production/tplg-targets-hda-generic.cmake
Outdated
Show resolved
Hide resolved
Added: sof-hda-generic-dax.tplg sof-hda-generic-2ch-dax.tplg sof-hda-generic-cavs25-2ch-dax.tplg sof-hda-generic-ace1-2ch-dax.tplg sof-hda-generic-ace3-2ch-dax.tplg Signed-off-by: Jun Lai <jun.lai@dolby.com>
checkupup
force-pushed
the
dax_hda_tplg
branch
from
a28c8ae to
68fcf1a
Compare
| DEEP_BUFFER_PIPELINE_SINK 'mixout.2.1' | ||
| DEEP_BUFFER_PCM_NAME 'Deepbuffer HDA Analog' | ||
| HDA_ANALOG_CAPTURE_RATE 48000 | ||
| HDA_ANALOG_PLAYBACK_RATE 48000 |
There was a problem hiding this comment.
Nitpick: The indentation is weird. Can we always use tab instead of space?
There was a problem hiding this comment.
Ack, please use tabs. The topology files use alsaconf language so we should align to upstream style (e.g. alsa-ucm repositories).
There are lot of exceptions for historical reasons and we haven't blocked PRs due to this, but for any new topology files, we should use consistent style.
|
|
||
| "sof-hda-generic\;sof-hda-generic-2ch-dax\;HDA_CONFIG=dax,NUM_DMICS=2,\ | ||
| DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,\ | ||
| EFX_DMIC0_DRC_PARAMS=dmic_default,DOLBY_DAX_CORE_ID=1" |
There was a problem hiding this comment.
@kv2019i I think we need PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-2ch-dax.bin,\ to include the DMIC NHL as DMIC is enabled, right?
There was a problem hiding this comment.
@bardliao This is ok, the sof-hda-generic variants with a platform (cavs25/ace1/ace3) name in the filename are on purpose without a NHLT blob. The assumption is that BIOS has correct NHLT info. We also ship variants with NHLT blobs in topology, but kernel will not load these automatically (tplg override must be used).
kv2019i
left a comment
kv2019i
left a comment
There was a problem hiding this comment.
Looks pretty good. One answer to Bard inline and a few additional minor comments.
|
|
||
| "sof-hda-generic\;sof-hda-generic-2ch-dax\;HDA_CONFIG=dax,NUM_DMICS=2,\ | ||
| DMIC0_ENHANCED_CAPTURE=true,EFX_DMIC0_TDFB_PARAMS=line2_generic_pm10deg,\ | ||
| EFX_DMIC0_DRC_PARAMS=dmic_default,DOLBY_DAX_CORE_ID=1" |
There was a problem hiding this comment.
@bardliao This is ok, the sof-hda-generic variants with a platform (cavs25/ace1/ace3) name in the filename are on purpose without a NHLT blob. The assumption is that BIOS has correct NHLT info. We also ship variants with NHLT blobs in topology, but kernel will not load these automatically (tplg override must be used).
| DEEP_BUFFER_PIPELINE_SINK 'mixout.2.1' | ||
| DEEP_BUFFER_PCM_NAME 'Deepbuffer HDA Analog' | ||
| HDA_ANALOG_CAPTURE_RATE 48000 | ||
| HDA_ANALOG_PLAYBACK_RATE 48000 |
There was a problem hiding this comment.
Ack, please use tabs. The topology files use alsaconf language so we should align to upstream style (e.g. alsa-ucm repositories).
There are lot of exceptions for historical reasons and we haven't blocked PRs due to this, but for any new topology files, we should use consistent style.
| EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" | ||
|
|
||
| "sof-hda-generic\;sof-hda-generic-cavs25-2ch-dax\;HDA_CONFIG=dax,NUM_DMICS=2,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-cavs25-2ch.bin,\ |
There was a problem hiding this comment.
This will be a no-op with no functional impact, but please use "NHLT_BIN=nhlt-sof-hda-generic-cavs25-2ch-dax.bin". The definitions are a bit redundant as the NHLT binary is always same as the tplg basename, but to pass the filename to nhtl-plugin in alsa-utils, we need to set NHLT_BIN in these cmake rules.
| EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" | ||
|
|
||
| "sof-hda-generic\;sof-hda-generic-ace1-2ch-dax\;PLATFORM=mtl,HDA_CONFIG=dax,NUM_DMICS=2,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace1-2ch.bin,\ |
| EFX_DMIC0_TDFB_PARAMS=line4_pass,EFX_DMIC0_DRC_PARAMS=dmic_default" | ||
|
|
||
| "sof-hda-generic\;sof-hda-generic-ace3-2ch-dax\;PLATFORM=ptl,HDA_CONFIG=dax,NUM_DMICS=2,\ | ||
| PREPROCESS_PLUGINS=nhlt,NHLT_BIN=nhlt-sof-hda-generic-ace3-2ch.bin,\ |
5 participants
Added:
sof-hda-generic-dax.tplg
sof-hda-generic-2ch-dax.tplg
sof-hda-generic-cavs25-2ch-dax.tplg
sof-hda-generic-ace1-2ch-dax.tplg
sof-hda-generic-ace3-2ch-dax.tplg