topology2: fix HDMI link IDs for sof-lnl-rt713-l0-rt1318-l1#10958
Open
likewhatevs wants to merge 1 commit into
Open
topology2: fix HDMI link IDs for sof-lnl-rt713-l0-rt1318-l1#10958likewhatevs wants to merge 1 commit into
likewhatevs wants to merge 1 commit into
Conversation
This topology has no DMIC backend, but inherits the default HDMI backend-link IDs of 5/6/7 from hdmi-default.conf. Those defaults assume a DMIC link occupies ID 4, so they start HDMI at 5. The sof_sdw machine driver assigns backend-link IDs compactly. For this board the SoundWire jack and rt1318 amplifier links take IDs 0-3, and with no DMIC the iDisp links follow at 4/5/6. The topology's iDisp1 at ID 5 then matches no card link and the probe fails: ASoC: physical link iDisp1 (id 5) not exist error: failed to load DSP topology -22 sof_sdw: ASoC: failed to instantiate card -22 so the whole card, including speaker playback, is lost. Set HDMI1_ID/HDMI2_ID/HDMI3_ID to 4/5/6 to match the IDs the driver creates for the no-DMIC case. This mirrors the -2ch variant, which adds two DMIC links at IDs 4/5 and correspondingly places HDMI at 6/7/8. Signed-off-by: Pat Somaru <patso@likewhatevs.io>
Collaborator
|
Can one of the admins verify this patch?
|
Contributor
There was a problem hiding this comment.
Pull request overview
This PR updates the topology2 build target for sof-lnl-rt713-l0-rt1318-l1 (Lunar Lake) to override HDMI backend-link IDs so they match the compact ID assignment used by the sof_sdw machine driver when no DMIC links are present. This prevents topology load failure (and therefore loss of the entire card, including speaker playback) in the no-DMIC case described in the PR.
Changes:
- Override
HDMI1_ID/HDMI2_ID/HDMI3_IDto4/5/6forsof-lnl-rt713-l0-rt1318-l1in the ace2 production target list. - Align the non-
-2chvariant’s HDMI link IDs with the existing-2chvariant’s ID spacing behavior (which already accounts for DMIC links and places HDMI at6/7/8).
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Hi, I disabled my mic in my bios (lenovo lunar lake laptop) and my speaker stopped working. This PR fixed it.
I don't quite follow the fix but AI says it's the following:
This topology has no DMIC backend, but inherits the default HDMI backend-link IDs of 5/6/7 from hdmi-default.conf. Those defaults assume a DMIC link occupies ID 4, so they start HDMI at 5.
The sof_sdw machine driver assigns backend-link IDs compactly. For this board the SoundWire jack and rt1318 amplifier links take IDs 0-3, and with no DMIC the iDisp links follow at 4/5/6. The topology's iDisp1 at ID 5 then matches no card link and the probe fails:
ASoC: physical link iDisp1 (id 5) not exist
error: failed to load DSP topology -22
sof_sdw: ASoC: failed to instantiate card -22
so the whole card, including speaker playback, is lost.
Set HDMI1_ID/HDMI2_ID/HDMI3_ID to 4/5/6 to match the IDs the driver creates for the no-DMIC case. This mirrors the -2ch variant, which adds two DMIC links at IDs 4/5 and correspondingly places HDMI at 6/7/8.