You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
32 lines
1.2 KiB
Diff
32 lines
1.2 KiB
Diff
From 1cf3e20f13378430cd1fc929548bca9f5e517afe Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Wed, 25 Mar 2020 18:03:42 +0000
|
|
Subject: [PATCH] drm/vc4: Set the b-frame marker to the match ALSA's
|
|
default.
|
|
|
|
ALSA's iec958 plugin by default sets the block start preamble
|
|
to 8, whilst this driver was programming the hardware to expect
|
|
0xF.
|
|
Amend the hardware config to match ALSA.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 3 ++-
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -885,10 +885,11 @@ static int vc4_hdmi_audio_hw_params(stru
|
|
|
|
vc4_hdmi_audio_set_mai_clock(vc4_hdmi);
|
|
|
|
+ /* The B frame identifier should match the value used by alsa-lib (8) */
|
|
audio_packet_config =
|
|
VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_SAMPLE_FLAT |
|
|
VC4_HDMI_AUDIO_PACKET_ZERO_DATA_ON_INACTIVE_CHANNELS |
|
|
- VC4_SET_FIELD(0xf, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER);
|
|
+ VC4_SET_FIELD(0x8, VC4_HDMI_AUDIO_PACKET_B_FRAME_IDENTIFIER);
|
|
|
|
channel_mask = GENMASK(vc4_hdmi->audio.channels - 1, 0);
|
|
audio_packet_config |= VC4_SET_FIELD(channel_mask,
|