ASoC: hdmi-codec: Fix broken channel map reporting #5597
Conversation
Commit 5fe680b23327 ("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
Revert this incorrect change so that channel maps are properly
reported again.
Fixes: 5fe680b23327 ("ASoC: hdmi-codec: fix channel info for compressed formats")
Cc: [email protected]
Signed-off-by: Matthias Reichl <[email protected]>
|
From @HiassofT here: LibreELEC/LibreELEC.tv#8122 |
|
Commit hash of the fixes looks dubious. On rpi-6.1.y it's 3f38871, but that has "commit 4e08713 upstream" in the commit text for the backport, and that would appear to be the commit in mainline (torvalds/linux@4e08713) |
|
There was a bit of a mix-up as both broonie and tiwai applied the patch to their trees - seems the other commit hash survived when it was finally merged into mainline |
|
Ah, sorry, my fault, 4e08713 is indeed the right githash - the hash in the commit message is wrong (glad you noticed that before I sent it upstream) |
|
I've sent the fix upstream now, with corrected hashes in the commit message. Best if you pick that one instead |
|
The version of the patch sent upstream as been applied and pushed offline. |
kernel: ASoC: hdmi-codec: Fix broken channel map reporting See: raspberrypi/linux#5597 kernel: Backport fix for f2fs NULL pointer dereference in f2fs_issue_flush() See: raspberrypi/linux#5599
kernel: ASoC: hdmi-codec: Fix broken channel map reporting See: raspberrypi/linux#5597 kernel: Backport fix for f2fs NULL pointer dereference in f2fs_issue_flush() See: raspberrypi/linux#5599
Commit 5fe680b23327 ("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
Revert this incorrect change so that channel maps are properly reported again.
Fixes: 5fe680b23327 ("ASoC: hdmi-codec: fix channel info for compressed formats")
Cc: [email protected]