mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-10-20 14:38:20 +02:00
a2d4b5711a
Removed upstreamed: pending-5.10/841-USB-serial-option-add-ZTE-MF286D-modem.patch[1] bcm27xx/950-0592-drm-vc4-Allow-DBLCLK-modes-even-if-horz-timing-is-od.patch[2] All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=7113440a36c741efd7c76e3d70b3634100120cdb 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.101&id=21c890ca8eaecea06cabb92be2a53a6f26f56383 Build system: x86_64 Build-tested: bcm2711/RPi4B, mt7622/RT3200 Run-tested: bcm2711/RPi4B, mt7622/RT3200 Signed-off-by: John Audia <graysky@archlinux.us>
26 lines
962 B
Diff
26 lines
962 B
Diff
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
|
|
@@ -1065,7 +1065,11 @@ static int vc4_hdmi_audio_prepare(struct
|
|
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) |
|