topology: hdmi-generic: change HDMI PCM id by bardliao · Pull Request #6787 · thesofproject/sof

bardliao · 2022-12-13T12:12:38Z

Define HDMI_PCM_ID macro so that we can have different pcm id for different topology. And change the hdmi pcm id of sof-hda-generic.tplg to align with UCM.

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

kv2019i

Comments inline.

plbossart · 2022-12-16T15:40:58Z

@kv2019i for sof-sdw we only have 3 devices in the UCM conf. So there's no issue if we stop using the 4th pipe for audio for new platforms

# Use case Configuration for sof-soundwire

Include.hdmi.File "/codecs/hda/hdmi.conf"

If.hdmi1 {
	Condition { Type AlwaysTrue }
	True.Macro.hdmi1.HDMI {
		Number 1
		Device 5
		Priority 500
	}
}

If.hdmi2 {
	Condition { Type AlwaysTrue }
	True.Macro.hdmi2.HDMI {
		Number 2
		Device 6
		Priority 600
	}
}

If.hdmi3 {
	Condition { Type AlwaysTrue }
	True.Macro.hdmi2.HDMI {
		Number 3
		Device 7
		Priority 700
	}
}

bardliao · 2022-12-19T07:35:42Z

@plbossart I added a commit to change NUM_HDMIS from 4 to 3 for all existing topologies, but keep hdmi-4th.conf in case we want to use it in the future. I also add other commits to fix the pipeline id conflict between sdw speaker and hdmi and add hdmi support to the existing sdw topologies.

lgirdwood · 2022-12-19T16:57:32Z

@bardliao @jsarha I assume we can change
"copier.host.50.1" to "copier.host.$HDMI1_HOST_PIPELINE_ID.1"
i.e. we dereference the HDMI1_HOST_PIPELINE_ID assignment above ?

@bardliao @jsarha I assume we can change "copier.host.50.1" to "copier.host.$HDMI1_HOST_PIPELINE_ID.1" i.e. we dereference the HDMI1_HOST_PIPELINE_ID assignment above ?

That is what I was looking for. But according to @ranj063, we don't support it yet.

@bardliao @jsarha I assume we can change "copier.host.50.1" to "copier.host.$HDMI1_HOST_PIPELINE_ID.1" i.e. we dereference the HDMI1_HOST_PIPELINE_ID assignment above ?

That is what I was looking for. But according to @ranj063, we don't support it yet.

ok, got you - @jsarha can you confirm this is in your topology improvement work.

@bardliao @lgirdwood that is not exactly what I trying to achieve just yet. So far I've been looking for a way to implement variable substitution for alsa control names, not generic widget name substitution.

plbossart

couple of comments below @bardliao

plbossart · 2022-12-19T23:32:08Z

HDMI in capital letters

plbossart · 2022-12-19T23:32:25Z

typo: Playback

plbossart · 2022-12-19T23:40:50Z

this topology name needs to be fixed or this needs to moved to a different develop, it's not used by the kernel.

cavs-sdw.conf uses grouped route and pipeline id. And index 20 based is for Speaker pcm. That will conflict with the existing hdmi1 pipeline id. Update hdmi route and pipeline ids with the same formula to avoid the conflict. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Define HDMI_PCM_ID macro so that we can have different pcm id for different topology. And change the hdmi pcm id of sof-hda-generic.tplg to align with UCM. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

Set NUM_HDMIS=3 for all topologies. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

bardliao · 2022-12-20T11:44:37Z

@kv2019i @miRoox Can you take a look the "topology2: move development topologies to development folder" commit? Some topologies are moved to development folder. I think CI will be impacted.

Some topologies are for development only. Move them to the development folder. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

lgirdwood · 2023-01-04T15:59:08Z

@plbossart good for you ?

plbossart · 2023-01-05T15:07:02Z

@ranj063 can you please double-check this PR?

marc-hb · 2023-01-12T23:46:14Z

This caused regression

[BUG][MTL] tplg failed to load on MTL-SDW #6947

Tentative fix that disables HDMI:

topology2: remove HDMI from topologies for MTL #6946

kv2019i · 2023-01-13T11:43:48Z

This also causes regression on ADL SDW config and was picked up by CI -> https://sof-ci.01.org/sofpr/PR6931/build3353/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=verify-kernel-boot-log and https://sof-ci.01.org/sofpr/PR6787/build3161/devicetest/index.html?model=ADLP_RVP_SDW_IPC4ZPH&testcase=verify-kernel-boot-log

@bardliao @lgirdwood Unless we have a quick fix, we need to revert his.

lgirdwood · 2023-01-13T12:35:08Z

Ok, lets revert. @bardliao I guess you have enough data to root cause.

marc-hb · 2023-01-13T19:43:48Z

Revert submitted by @lgirdwood in #6953

Indeed this was merged despite ADLP_RVP_SDW_IPC4ZPH totally failing in https://sof-ci.01.org/sofpr/PR6787/build3161/devicetest/index.html !

@bardliao please convert failing PRs to "draft" to block merges of failing PRs and help overloaded reviewers (also: please submit a revert if there's no quick fix)

bardliao · 2023-01-16T11:07:32Z

Revert submitted by @lgirdwood in #6953

Indeed this was merged despite ADLP_RVP_SDW_IPC4ZPH totally failing in https://sof-ci.01.org/sofpr/PR6787/build3161/devicetest/index.html !

@bardliao please convert failing PRs to "draft" to block merges of failing PRs and help overloaded reviewers (also: please submit a revert if there's no quick fix)

@marc-hb Sorry for the regressions. The problem is that as I mentioned on #6787 (comment), the CI will be impacted, so the PR test result was not reliable for this PR.
I do post fix PRs in some hour when I was informed that this PR causes some regressions and that's why I didn't submit a revert.

marc-hb · 2023-01-17T20:20:25Z

the CI will be impacted, so the PR test result was not reliable for this PR.

In situations with a CI dependency like this we should coordinate and make the CI changes first (after local testing and approvals). Then use "SOFCI TEST" in 6787. If the tests pass then 6787 can be merged, if tests still don't pass then CI changes should be reverted.

Another possibility is to temporarily disable some tests in some configurations.

I do post fix PRs in some hour when I was informed that this PR causes some regressions and that's why I didn't submit a revert.

"Quick" fixes are great except they must be tested, reviewed etc. which means they're almost never quick.

bardliao requested review from RanderWang, plbossart and ranj063 December 13, 2022 12:12

bardliao requested review from dbaluta, lbetlej, lgirdwood and mmaka1 as code owners December 13, 2022 12:12

bardliao mentioned this pull request Dec 13, 2022

pulse audio not detecting sound card (MTL,HDA) thesofproject/linux#4068

Closed

plbossart reviewed Dec 13, 2022

View reviewed changes

Comment thread tools/topology/topology2/sof-hda-generic.conf Outdated

bardliao force-pushed the hdmi-cpm-id branch from 06913e6 to 2857c93 Compare December 14, 2022 01:34

plbossart reviewed Dec 14, 2022

View reviewed changes

Comment thread tools/topology/topology2/platform/intel/hdmi-default.conf Outdated

Comment thread tools/topology/topology2/platform/intel/hdmi-generic.conf Outdated

kv2019i reviewed Dec 16, 2022

View reviewed changes

Comment thread tools/topology/topology2/platform/intel/hdmi-generic.conf Outdated

bardliao force-pushed the hdmi-cpm-id branch from 2857c93 to c087750 Compare December 19, 2022 07:29

bardliao requested review from aborisovich and marc-hb as code owners December 19, 2022 07:29

lgirdwood reviewed Dec 19, 2022

View reviewed changes

plbossart requested changes Dec 19, 2022

View reviewed changes

bardliao added 3 commits December 20, 2022 10:44

topology: hdmi-generic: change HDMI PCM id

14c0ce6

Define HDMI_PCM_ID macro so that we can have different pcm id for different topology. And change the hdmi pcm id of sof-hda-generic.tplg to align with UCM. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

topology2: set NUM_HDMIS=3 topologies

1920045

Set NUM_HDMIS=3 for all topologies. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

bardliao force-pushed the hdmi-cpm-id branch from c087750 to 1920045 Compare December 20, 2022 02:54

bardliao force-pushed the hdmi-cpm-id branch from 5484d1a to 217ca35 Compare December 22, 2022 06:05

topology2: move development topologies to development folder

217ca35

Some topologies are for development only. Move them to the development folder. Signed-off-by: Bard Liao <yung-chuan.liao@linux.intel.com>

libinyang mentioned this pull request Jan 5, 2023

topology2: set DMIC0 pcm id to 6 #6904

Merged

plbossart approved these changes Jan 5, 2023

View reviewed changes

lgirdwood approved these changes Jan 6, 2023

View reviewed changes

lgirdwood merged commit fab1376 into thesofproject:main Jan 11, 2023

lgirdwood mentioned this pull request Jan 13, 2023

Revert "topology: hdmi-generic: change HDMI PCM id" #6953

Closed

bardliao mentioned this pull request Jan 16, 2023

topology2: remove HDMI from topologies for MTL #6946

Merged

Conversation

bardliao commented Dec 13, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kv2019i left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

plbossart commented Dec 16, 2022

Uh oh!

bardliao commented Dec 19, 2022

Uh oh!

lgirdwood Dec 19, 2022

Choose a reason for hiding this comment

Uh oh!

bardliao Dec 20, 2022

Choose a reason for hiding this comment

Uh oh!

lgirdwood Dec 20, 2022

Choose a reason for hiding this comment

Uh oh!

jsarha Jan 16, 2023

Choose a reason for hiding this comment

Uh oh!

plbossart left a comment

Choose a reason for hiding this comment

Uh oh!

plbossart Dec 19, 2022

Choose a reason for hiding this comment

Uh oh!

plbossart Dec 19, 2022

Choose a reason for hiding this comment

Uh oh!

Uh oh!

plbossart Dec 19, 2022

Choose a reason for hiding this comment

Uh oh!

bardliao commented Dec 20, 2022

Uh oh!

lgirdwood commented Jan 4, 2023

Uh oh!

plbossart commented Jan 5, 2023

Uh oh!

marc-hb commented Jan 12, 2023

Uh oh!

kv2019i commented Jan 13, 2023

Uh oh!

lgirdwood commented Jan 13, 2023

Uh oh!

marc-hb commented Jan 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

bardliao commented Jan 16, 2023

Uh oh!

marc-hb commented Jan 17, 2023

Uh oh!

Reviewers

Uh oh!

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

marc-hb commented Jan 13, 2023 •

edited

Loading