2021-08-21 08:54:34 +00:00
|
|
|
From 465b5e6889b1af1c9c061751a0ee234a27644030 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
Date: Fri, 10 Jul 2020 11:51:16 +0100
|
|
|
|
|
Subject: [PATCH] drm/vc4: enable HBR MAI format on HBR streams
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Matthias Reichl <hias@horus.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 6 +++++-
|
|
|
|
|
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
2022-02-16 14:46:00 +00:00
|
|
|
@@ -1065,7 +1065,11 @@ static int vc4_hdmi_audio_prepare(struct
|
2021-08-21 08:54:34 +00:00
|
|
|
vc4_hdmi_audio_set_mai_clock(vc4_hdmi);
|
|
|
|
|
|
|
|
|
|
mai_sample_rate = sample_rate_to_mai_fmt(vc4_hdmi->audio.samplerate);
|
|
|
|
|
- mai_audio_format = VC4_HDMI_MAI_FORMAT_PCM;
|
|
|
|
|
+ if (vc4_hdmi->audio.iec_status[0] & IEC958_AES0_NONAUDIO &&
|
|
|
|
|
+ vc4_hdmi->audio.channels == 8)
|
|
|
|
|
+ mai_audio_format = VC4_HDMI_MAI_FORMAT_HBR;
|
|
|
|
|
+ else
|
|
|
|
|
+ mai_audio_format = VC4_HDMI_MAI_FORMAT_PCM;
|
|
|
|
|
HDMI_WRITE(HDMI_MAI_FMT,
|
|
|
|
|
VC4_SET_FIELD(mai_sample_rate,
|
|
|
|
|
VC4_HDMI_MAI_FORMAT_SAMPLE_RATE) |
|
