Skip to content

Pass uuid token to the smart_amp widget#3374

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgirdwood merged 2 commits into from
Sep 9, 2020
Merged

Pass uuid token to the smart_amp widget #3374

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29338af
topology: smart_amp: Pass uuid token to the smart_amp widget
Sep 1, 2020
b5f007c
topology: Add UUID for Maxim DSM component
Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions tools/topology/m4/smart_amp.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
divert(-1)

dnl Define macro for smart_amp(Smart Amplifier) widget
DECLARE_SOF_RT_UUID("smart_amp-test", smart_amp_comp_uuid, 0x167a961e, 0x8ae4,
0x11ea, 0x89, 0xf1, 0x00, 0x0c, 0x29, 0xce, 0x16, 0x35)

dnl SMART_AMP name)
define(`N_SMART_AMP', `SMART_AMP'PIPELINE_ID`.'$1)

dnl W_SMART_AMP(name, format, periods_sink, periods_source, kcontrols_list)
dnl W_SMART_AMP(name, uuid, format, periods_sink, periods_source, kcontrols_list)
define(`W_SMART_AMP',
`SectionVendorTuples."'N_SMART_AMP($1)`_tuples_uuid" {'
` tokens "sof_comp_tokens"'
` tuples."uuid" {'
` SOF_TKN_COMP_UUID' STR(smart_amp_comp_uuid)
` SOF_TKN_COMP_UUID' STR($2)
` }'
`}'
`SectionData."'N_SMART_AMP($1)`_data_uuid" {'
Expand All@@ -21,8 +19,8 @@ define(`W_SMART_AMP',
`SectionVendorTuples."'N_SMART_AMP($1)`_tuples_w" {'
` tokens "sof_comp_tokens"'
` tuples."word" {'
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($3)
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($4)
` SOF_TKN_COMP_PERIOD_SINK_COUNT' STR($4)
` SOF_TKN_COMP_PERIOD_SOURCE_COUNT' STR($5)
` }'
`}'
`SectionData."'N_SMART_AMP($1)`_data_w" {'
Expand All@@ -31,7 +29,7 @@ define(`W_SMART_AMP',
`SectionVendorTuples."'N_SMART_AMP($1)`_tuples_str" {'
` tokens "sof_comp_tokens"'
` tuples."string" {'
` SOF_TKN_COMP_FORMAT' STR($2)
` SOF_TKN_COMP_FORMAT' STR($3)
` }'
`}'
`SectionVendorTuples."'N_SMART_AMP($1)`_process_tuples_str" {'
Expand All@@ -54,7 +52,7 @@ define(`W_SMART_AMP',
` "'N_SMART_AMP($1)`_data_str"'
` ]'
` bytes ['
$5
$6
` ]'
`}')

Expand Down
4 changes: 4 additions & 0 deletions tools/topology/sof-tgl-max98373-rt5682.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -62,6 +62,10 @@ define(`SMART_REF_CH_NUM', 4)
define(`SMART_PCM_ID', 0)
define(`SMART_PCM_NAME', `smart373-spk')

# UUID related
DECLARE_SOF_RT_UUID("Maxim DSM", maxim_dsm_comp_uuid, 0x0cd84e80, 0xebd3,
0x11ea, 0xad, 0xc1, 0x02, 0x42, 0xac, 0x12, 0x00, 0x02);
define(`SMART_UUID', maxim_dsm_comp_uuid)

@keyonjiekeyonjieSep 2, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This means we will test Maxim DSM only with this tplg, are we ready for that?

@RDharageswariRDharageswariSep 2, 2020

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi Keyon,
Yes the basic DSM functionality is working, also the PR from maxim is merged & 2 are under review.

#3248

Static library support + license/Readme information were included on the next PR.
#3373

UUID change was applied to the next PR.
#3372

@keyonjiekeyonjieSep 2, 2020

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, then the PR here looks good to me, let's wait until the UUID change applied and then apply this here.

# Include Smart Amplifier support
include(`sof-smart-amplifier.m4')

Expand Down
5 changes: 4 additions & 1 deletion tools/topology/sof/pipe-smart-amplifier-playback.m4
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,6 +28,9 @@ ifdef(`SMART_TX_CHANNELS',`',`errprint(note: Need to define DAI TX channel numbe
ifdef(`SMART_FB_CHANNELS',`',`errprint(note: Need to define feedback channel number for sof-smart-amplifier
)')

DECLARE_SOF_RT_UUID("smart_amp-test", smart_amp_comp_uuid, 0x167a961e, 0x8ae4,
0x11ea, 0x89, 0xf1, 0x00, 0x0c, 0x29, 0xce, 0x16, 0x35)
ifdef(`SMART_UUID',`', `define(`SMART_UUID', smart_amp_comp_uuid)');
#
# Controls
#
Expand DownExpand Up@@ -88,7 +91,7 @@ C_CONTROLBYTES_VOLATILE_READONLY(Smart_amp Model_Get_params, PIPELINE_ID,
W_PCM_PLAYBACK(PCM_ID, Smart Amplifier Playback, 2, 0)

# Mux 0 has 2 sink and source periods.
W_SMART_AMP(0, PIPELINE_FORMAT, 2, 2, LIST(` ', "Smart_amp Config", "Smart_amp Model",
W_SMART_AMP(0, SMART_UUID, PIPELINE_FORMAT, 2, 2, LIST(` ', "Smart_amp Config", "Smart_amp Model",
ifelse(SOF_ABI_VERSION_3_17_OR_GRT, `1', "Smart_amp Model_Get_params")))

# Low Latency Buffers
Expand Down