Skip to content

topology: sof-cht-max98090 move DAI definition above media pipeline - #1846

Merged
tlauda merged 2 commits into
thesofproject:masterfrom
cujomalainey:topo-fix
Sep 20, 2019
Merged

tlauda merged 2 commits into
thesofproject:masterfrom
cujomalainey:topo-fix

Conversation

@cujomalainey

Copy link
Copy Markdown
Contributor

The DAI definition needs to come first otherwise the media pipeline with
be parsed incorrectly resulting in a failure to load the topology

Signed-off-by: Curtis Malainey cujomalainey@google.com

The DAI definition needs to come first otherwise the media pipeline with
be parsed incorrectly resulting in a failure to load the topology

Signed-off-by: Curtis Malainey <cujomalainey@google.com>
Reduce size of buffers so dsp doesn't run out of memory on topology load

Signed-off-by: Curtis Malainey <cujomalainey@google.com>

@juimonen juimonen left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

LGTM

@tlauda

tlauda commented Sep 20, 2019

Copy link
Copy Markdown
Contributor

@cujomalainey What is the exact problem? @xiulipan has recently fixed DAI_ADD macro, so maybe your change is no longer needed.

@cujomalainey

Copy link
Copy Markdown
Contributor Author

@tlauda for some reason on ToT the topology will parse out differently and leave the schedule component token in the final conf file which when parsee by the kernel will not be defined properly, I can attach logs and examples in a few hours

@tlauda

tlauda commented Sep 20, 2019

Copy link
Copy Markdown
Contributor

@cujomalainey Yes, please. And also what is ToT?

@ranj063

ranj063 commented Sep 20, 2019

Copy link
Copy Markdown
Collaborator

@cujomalainey What is the exact problem? @xiulipan has recently fixed DAI_ADD macro, so maybe your change is no longer needed.

@tlauda the sof-dai-playback m4 file defines the schedule comp for the media pipeline to use. So the DAI_ADD def has to be before the media pipeline is added.

@juimonen

Copy link
Copy Markdown

@tlauda media pipe definition needs the scheduling component definition (in dai), because of branched pipeline. Dai definition takes only 1 pipeline id as argument (which is the low latency). That's why it should be before media pipe... so is this somehow changed now?

@juimonen

Copy link
Copy Markdown

@ranj063 ok you we're before me here :)

@tlauda

tlauda commented Sep 20, 2019

Copy link
Copy Markdown
Contributor

@ranj063 @juimonen Got it now, thanks.

@tlauda
tlauda merged commit 0b47129 into thesofproject:master Sep 20, 2019
@cujomalainey

Copy link
Copy Markdown
Contributor Author

@tlauda fyi ToT (top of tree) :)

@xiulipan

Copy link
Copy Markdown
Contributor

@cujomalainey @tlauda It seems like a workaroud to me. I will look into the issue to check what goes wrong with the m4 framework.

@tlauda

tlauda commented Sep 22, 2019

Copy link
Copy Markdown
Contributor

@xiulipan It isn't a workaround. Media pipeline needs particular DAI as a scheduling component, so it needs to be defined before pipe itself.

@xiulipan

Copy link
Copy Markdown
Contributor

@tlauda Got that, thanks for the explanation, then this is m4 limitation. We will need to add this into some WIKI or readme.

@cujomalainey
cujomalainey deleted the topo-fix branch September 24, 2019 16:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants