Replace hdmi-codec channel map fix with accepted verison #5628
Conversation
This file contains 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
This reverts commit a319c6c.
Commit b84b531 upstream. Commit 4e08713 ("ASoC: hdmi-codec: fix channel info for compressed formats") accidentally changed hcp->chmap_idx from ca_id, the CEA channel allocation ID, to idx, the index to the table of channel mappings ordered by preference. This resulted in wrong channel maps being reported to userspace, eg for 5.1 "FL,FR,LFE,FC" was reported instead of the expected "FL,FR,LFE,FC,RL,RR": ~ # speaker-test -c 6 -t sine ... 0 - Front Left 3 - Front Center 1 - Front Right 2 - LFE 4 - Unknown 5 - Unknown ~ # amixer cget iface=PCM,name='Playback Channel Map' | grep ': values' : values=3,4,8,7,0,0,0,0 Switch this back to ca_id in case of PCM audio so the correct channel map is reported again and set it to HDMI_CODEC_CHMAP_IDX_UNKNOWN in case of non-PCM audio so the PCM channel map control returns "Unknown" channels (value 0). Fixes: 4e08713 ("ASoC: hdmi-codec: fix channel info for compressed formats") Cc: [email protected] Signed-off-by: Matthias Reichl <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
|
Thanks! |
popcornmix
added a commit
to raspberrypi/firmware
that referenced
this pull request
Oct 5, 2023
kernel: vc4/drm: Remove the clear of SCALER_DISPBKGND_FILL See: raspberrypi/linux#5633 kernel: media: i2c: Move Kconfig entry for IMX477 to the camera sensor section See: raspberrypi/linux#5631 kernel: cfe improvements/fixes See: raspberrypi/linux#5630 kernel: Add DT aliases to map to DRM card names See: raspberrypi/linux#5629 kernel: Replace hdmi-codec channel map fix with accepted version See: raspberrypi/linux#5628 kernel: overlays: Fix vc4-kms-dsi-7inch See: raspberrypi/linux#5622
popcornmix
added a commit
to raspberrypi/rpi-firmware
that referenced
this pull request
Oct 5, 2023
kernel: vc4/drm: Remove the clear of SCALER_DISPBKGND_FILL See: raspberrypi/linux#5633 kernel: media: i2c: Move Kconfig entry for IMX477 to the camera sensor section See: raspberrypi/linux#5631 kernel: cfe improvements/fixes See: raspberrypi/linux#5630 kernel: Add DT aliases to map to DRM card names See: raspberrypi/linux#5629 kernel: Replace hdmi-codec channel map fix with accepted version See: raspberrypi/linux#5628 kernel: overlays: Fix vc4-kms-dsi-7inch See: raspberrypi/linux#5622
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.
v2 of the patch, with a minor change (report "unknown" channel mappings in case of non-pcm audio) has been accepted for 6.7:
https://lore.kernel.org/alsa-devel/[email protected]/
Replace the v1 version in the RPi tree so we are up to date