Skip to content

topology: fix conflict PIPE_VOLUME_PLAYBACK defination - #2827

Merged
lgirdwood merged 1 commit into
thesofproject:masterfrom
xiulipan:pr/fixhdaeq
Apr 21, 2020
Merged

topology: fix conflict PIPE_VOLUME_PLAYBACK defination#2827
lgirdwood merged 1 commit into
thesofproject:masterfrom
xiulipan:pr/fixhdaeq

Conversation

@xiulipan

@xiulipan xiulipan commented Apr 21, 2020 •
edited
Loading

Copy link
Copy Markdown
Contributor

in bxt.m4 and sof-hda-generic.m4, they both define the
PIPE_VOLUME_PLAYBACK, this will cause wrong tplg result.

Refine the them in sof-hda-generic.m4 to PIPE_HEADSET_PLAYBACK
to fix the issue.

Signed-off-by: Pan Xiuli xiuli.pan@linux.intel.com

Fix #2810

@xiulipan
xiulipan requested a review from ranj063 as a code owner April 21, 2020 04:08
@xiulipan xiulipan mentioned this pull request Apr 21, 2020
Closed
@xiulipan

xiulipan commented Apr 21, 2020

Copy link
Copy Markdown
Contributor Author

#2497 used same variable PIPE_VOLUME_PLAYBACK with #2444

This will bring conflict and override the feature in #2444, fixed by rename the variable used in sof-hda-generic.m4

ranj063
ranj063 reviewed Apr 21, 2020
View reviewed changes
Comment thread tools/topology/sof-hda-generic.m4 Resolved
@lgirdwood

lgirdwood commented Apr 21, 2020

Copy link
Copy Markdown
Member

@xiulipan @ranj063 should we namespace some of these. i.e. files that are included by others with a prefix ?

@xiulipan

xiulipan commented Apr 21, 2020

Copy link
Copy Markdown
Contributor Author

@lgirdwood I would like to refine the #2497
Some of the definition should not be added in glk.m4 or cml.m4. They should be all machine driver level not platform level. Set those variable in platform level will cause other problems later.

@xiulipan

xiulipan commented Apr 21, 2020

Copy link
Copy Markdown
Contributor Author

@lgirdwood A variable naming style maybe helpful here, it would avoid other variable conflict later.

@xiulipan
topology: fix conflict PIPE_VOLUME_PLAYBACK defination
ac16790 
in bxt.m4 and sof-hda-generic.m4, they both define the
PIPE_VOLUME_PLAYBACK, this will cause wrong tplg result.

Refine the them in sof-hda-generic.m4 to PIPE_HEADSET_PLAYBACK
to fix the issue.

Signed-off-by: Pan Xiuli <xiuli.pan@linux.intel.com>
@lgirdwood
lgirdwood merged commit 7d9ea98 into thesofproject:master Apr 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ranj063 ranj063 ranj063 left review comments
@lgirdwood lgirdwood lgirdwood approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

[BUG][CML][EQ]EQ test failed as no FIR/IIF pipelines available for pipeline 0~3

3 participants

@xiulipan @lgirdwood @ranj063