Skip to content

topology2: remove HDMI from topologies for MTL - #6946

Merged
kv2019i merged 1 commit into
thesofproject:mainfrom
bardliao:topology2-mtl
Jan 18, 2023
Merged

kv2019i merged 1 commit into
thesofproject:mainfrom
bardliao:topology2-mtl

Conversation

@bardliao

Copy link
Copy Markdown
Collaborator

There is no HDMI support on MTL RVP for now.

Signed-off-by: Bard Liao yung-chuan.liao@linux.intel.com

@bardliao

Copy link
Copy Markdown
Collaborator Author

I am not sure if this PR is the right solution. Or we should enable HDMI on SDW mode on MTL RVP?

@kv2019i

kv2019i commented Jan 13, 2023

Copy link
Copy Markdown
Collaborator

@bardliao Can't we use same solution we've used for all past platforms and have HDMI in topologies, but it's just not always used (handle with dummy codec). This will anyways be needed for product tplgs as well, as the integrated graphics solution may be disabled/not-used on some products.

@bardliao

Copy link
Copy Markdown
Collaborator Author

@bardliao Can't we use same solution we've used for all past platforms and have HDMI in topologies, but it's just not always used (handle with dummy codec). This will anyways be needed for product tplgs as well, as the integrated graphics solution may be disabled/not-used on some products.

@kv2019i This PR is to remove the HDMI from MTL SoundWire RVP topology. The issue is that somehow HDMI is not enabled on MTL SDW RVP and HDMI is not supported by MTL SDW topology until #6787

@kv2019i

kv2019i commented Jan 16, 2023

Copy link
Copy Markdown
Collaborator

@bardliao wrote:

@kv2019i This PR is to remove the HDMI from MTL SoundWire RVP topology. The issue is that somehow HDMI is not enabled on MTL SDW RVP and HDMI is not supported by MTL SDW topology until #6787

But we also have HDMI failure on ADL:
https://sof-ci.01.org/sofpr/PR6946/build3345/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=verify-kernel-boot-log

[ 7.768601] kernel: snd_soc_sof_sdw:sof_card_dai_links_create: sof_sdw sof_sdw: sdw 2, ssp 0, dmic 2, hdmi 4
[...]
[ 7.772592] kernel: sof_sdw sof_sdw: ASoC: physical link iDisp1 (id 5) not exist
[ 7.772619] kernel: sof_sdw sof_sdw: ASoC: topology: could not load header: -22

... and that surely has HDMI. So something's not adding up. The sof_sdw.c mach driver is checking the codec mask, and if HDMI is not available (e.g. IGFX disabled), then snd-soc-dummy is used instead.

If you remove HDMI from the topology, that will break if sof_sdw.c finds a HDMI codec. I think we should do the opposite, always have the HDMI nodes unless it is a hardware that will never have HDMI.

@bardliao

Copy link
Copy Markdown
Collaborator Author

@bardliao wrote:

@kv2019i This PR is to remove the HDMI from MTL SoundWire RVP topology. The issue is that somehow HDMI is not enabled on MTL SDW RVP and HDMI is not supported by MTL SDW topology until #6787

But we also have HDMI failure on ADL: https://sof-ci.01.org/sofpr/PR6946/build3345/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=verify-kernel-boot-log

[ 7.768601] kernel: snd_soc_sof_sdw:sof_card_dai_links_create: sof_sdw sof_sdw: sdw 2, ssp 0, dmic 2, hdmi 4 [...] [ 7.772592] kernel: sof_sdw sof_sdw: ASoC: physical link iDisp1 (id 5) not exist [ 7.772619] kernel: sof_sdw sof_sdw: ASoC: topology: could not load header: -22

That's exactly why I add

"cavs-sdw\;sof-adl-rt711-4ch\;DEEPBUFFER_FW_DMA_MS=100,NUM_DMICS=4,DMIC0_ID=2,\
DMIC1_ID=3,PDM1_MIC_A_ENABLE=1,PDM1_MIC_B_ENABLE=1,HDMI1_ID=4,HDMI2_ID=5,\
HDMI3_ID=6"

in 217ca35
We still see the issue because the DUT use cavs-sdw.tplg and rename it to sof-adl-rt711-4ch.tplg.
We should use sof-adl-rt711-4ch.tplg directly.

... and that surely has HDMI. So something's not adding up. The sof_sdw.c mach driver is checking the codec mask, and if HDMI is not available (e.g. IGFX disabled), then snd-soc-dummy is used instead.

Currently, sof_sdw will not create HDMI dai_links. But, yes using snd-soc-dummy is a good idea. I will do it after CNY.

If you remove HDMI from the topology, that will break if sof_sdw.c finds a HDMI codec. I think we should do the opposite, always have the HDMI nodes unless it is a hardware that will never have HDMI.

No, it will not break. The topology can be a subset of dai_links. I.e. Having HDMI on machine driver and not on topology is allowed.

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

I'm ok with this change as a development step that helps to keep CI healthy. For product tplg, the HDMI needs to be included.

There are some issues in CI still, so not approving until we understand the cause. So will these be fixed by #6957 or do we need change in DUT configuration in CI (to not copy/rename tplgs but copy them as is, FYI to @marc-hb ).

@bardliao

Copy link
Copy Markdown
Collaborator Author

I'm ok with this change as a development step that helps to keep CI healthy. For product tplg, the HDMI needs to be included.

There are some issues in CI still, so not approving until we understand the cause. So will these be fixed by #6957 or do we need change in DUT configuration in CI (to not copy/rename tplgs but copy them as is, FYI to @marc-hb ).

@kv2019i The change is only for MTL RVP. We don't have topology for MTL SDW products yet.

@kv2019i

kv2019i commented Jan 17, 2023

Copy link
Copy Markdown
Collaborator

#6957 now merged. Let's check CI again for this one.

@kv2019i

kv2019i commented Jan 17, 2023

Copy link
Copy Markdown
Collaborator

SOFCI TEST

@kv2019i kv2019i left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

CI looks clean now. A few issues, but not related to this PR.

@marc-hb

marc-hb commented Jan 17, 2023 •

Copy link
Copy Markdown
Collaborator

I think you mean https://sof-ci.01.org/sofpr/PR6946/build3413/devicetest/index.html

For comparison, unrelated https://sof-ci.01.org/sofpr/PR6960/build3411/devicetest/index.html is still failing ADLP_RVP_SDW_IPC4ZPH

EDIT2: and a bit later https://sof-ci.01.org/sofpr/PR6959/build3416/devicetest/index.html is now passing, maybe because sof_use_tplg_nhlt was changed? #6957 (comment)

@ranj063

ranj063 commented Jan 17, 2023

Copy link
Copy Markdown
Collaborator

@bardliao @kv2019i are we still going to do "Currently, sof_sdw will not create HDMI dai_links. But, yes using snd-soc-dummy is a good idea. I will do it after CNY."? and will that fix the issue targetted here? If so, can we please comment that in the cmakelists?

@bardliao

Copy link
Copy Markdown
Collaborator Author

@bardliao @kv2019i are we still going to do "Currently, sof_sdw will not create HDMI dai_links. But, yes using snd-soc-dummy is a good idea. I will do it after CNY."? and will that fix the issue targetted here? If so, can we please comment that in the cmakelists?

Yes, I will comment that in the Cmakelists

There is no HDMI support on MTL RVP for now.

Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>
@bardliao

Copy link
Copy Markdown
Collaborator Author

@bardliao @kv2019i are we still going to do "Currently, sof_sdw will not create HDMI dai_links. But, yes using snd-soc-dummy is a good idea. I will do it after CNY."? and will that fix the issue targetted here? If so, can we please comment that in the cmakelists?

Updated

@kv2019i
kv2019i merged commit 1a34ce7 into thesofproject:main Jan 18, 2023
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.

6 participants