sof-glk-nocodec: disable pipelines when disabling SSPs #8175
Conversation
approved :). @plbossart this is my patch |
|
Wait, we looked at the graph and found a problem. @ranj063 gave me a new patch. PS: please don't promote others' drafts. |
When we added the flags to disable SSP0 and SSP1 on the UP2, we took the shortcut of just removing the PCMs in topology but left the pipelines and widgets in the topology in. While this works in practice to prevent us from testing those SSPs, the right way is to also remove those pipelines also when the SSPs are disabled. This stops tplgtool2.py from complaining constantly about this inconsistency since thesofproject/sof-test#1079 which made the sof-test verify-tplg-binary.sh fail every time: ``` tplgtool2.py sof-glk-nocodec.tplg ERROR: No pcm id=0 for widget=PCM0C ERROR: No pcm id=1 for widget=PCM1C ERROR: No pcm id=0 for widget=PCM0P ERROR: No pcm id=1 for widget=PCM1P ERROR: tplgtool2.py returned 4 ``` This change affects only sof-apl-nocodec and sof-glk-nocodec. Signed-off-by: Marc Herbert <[email protected]> Signed-off-by: Ranjani Sridharan <[email protected]>
marc-hb
force-pushed
the
fix-glk-nocodec
branch
from
b609c10 to
8f5125c
Compare
|
New version from @ranj063 force-pushed, this time it's ready. See new, smaller graph and test results in stable-v2.2 TEST PR #8173. This patch has no effect on the main branch, I will cherry-pick -x after merge to stable-v2.2 (sticking to the normal flow) EDIT: tl;dr: all failures are unrelated, this can be merged. https://sof-ci.01.org/sofpr/PR8175/build12732/devicetest is all green and the MTL test failures are obviously totally irrelevant. QB has been out of order for the days but again it's not affected by topologies at all. I bisected the recent and irrelevant ZRESTRICT warning regression and filed bug |
When we added the flags to disable SSP0 and SSP1 on the UP2, we took the shortcut of just removing the PCMs in topology but left the pipelines and widgets in the topology in. While this works in practice to prevent us from testing those SSPs, the right way is to also remove those pipelines also when the SSPs are disabled.
This stops tplgtool2.py from complaining constantly about this inconsistency since thesofproject/sof-test#1079 which made the sof-test verify-tplg-binary.sh fail every time:
This change affects only sof-apl-nocodec and sof-glk-nocodec.