[stable-v2.2] sof-glk-nocodec: disable pipelines when disabling SSPs #8173
Conversation
|
https://sof-ci.01.org/sofpr/PR8173/build12674/devicetest/index.html?model=APL_UP2_NOCODEC&testcase=verify-tplg-binary is now passing and the graph looks good! Thanks @ranj063 for the fix. The kernel crash in https://sof-ci.01.org/sofpr/PR8173/build12674/devicetest/index.html?model=GLK_BOB_DA7219&testcase=check-sof-logger is known and unrelated (it's a different topology). Quickbuild https://sof-ci.01.org/sof-pr-viewer/#/build/PR8173/build12741623 does not support stable-v2.2, will never pass. I will submit to the main branch first (EDIT: #8175) to keep the usual flow and I will cherry-pick back here after merge. |
|
Here are the before/after topologies:
|
@marc-hb i've updated the patch to remove the DAI pipelines for SSP0/SSP1 for APL/GLK as well |
marc-hb
force-pushed
the
fix-nocodec-pipeline
branch
2 times, most recently
from
8c30faa to
6d1879f
Compare
|
Thanks again, looks better!
|
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]> (cherry picked from commit 9ccfbc4)
marc-hb
force-pushed
the
fix-nocodec-pipeline
branch
from
6d1879f to
6ba2a59
Compare
marc-hb
changed the title
marc-hb
changed the title
marc-hb
requested review from
lgirdwood,
plbossart,
mmaka1,
lbetlej and
dbaluta
as code owners
|
In https://sof-ci.01.org/sofpr/PR8173/build12777/devicetest, Everything else is green. |
|
SOFCI TEST Re-run and everything is all green (now with |
[Pure, clean cherry-pick from main branch #8175]
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 that complained constantly about this inconsistency since thesofproject/sof-test#1079 and made the sof-test verify-tplg-binary.sh fail every time:
This change affects only sof-apl-nocodec and sof-glk-nocodec.
(cherry picked from commit 9ccfbc4)