mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +00:00
1343acc8cd
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch Manually reverted: generic/pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch [3] [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 [3] https://lore.kernel.org/all/trinity-2a727d96-0335-4d03-8f30-e22a0e10112d-1643363480085@3c-app-gmx-bap33/ Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Signed-off-by: Daniel Golle <daniel@makrotopia.org>
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
From 3c398513990aa0edc5b9ebfbdd2395623562c6e4 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Thu, 25 Jun 2020 18:48:40 +0100
|
|
Subject: [PATCH] vc4_hdmi: Remove firmware logic for MAI threshold
|
|
setting
|
|
|
|
This was a workaround for bugs in hardware on earlier Pi models
|
|
and wasn't totally successful.
|
|
|
|
It makes audio quality worse on a Pi4 at the higher sample rates
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 22 ++++++----------------
|
|
1 file changed, 6 insertions(+), 16 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1084,22 +1084,12 @@ static int vc4_hdmi_audio_prepare(struct
|
|
audio_packet_config |= VC4_SET_FIELD(channel_mask,
|
|
VC4_HDMI_AUDIO_PACKET_CEA_MASK);
|
|
|
|
- /* Set the MAI threshold. This logic mimics the firmware's. */
|
|
- if (vc4_hdmi->audio.samplerate > 96000) {
|
|
- HDMI_WRITE(HDMI_MAI_THR,
|
|
- VC4_SET_FIELD(0x12, VC4_HD_MAI_THR_DREQHIGH) |
|
|
- VC4_SET_FIELD(0x12, VC4_HD_MAI_THR_DREQLOW));
|
|
- } else if (vc4_hdmi->audio.samplerate > 48000) {
|
|
- HDMI_WRITE(HDMI_MAI_THR,
|
|
- VC4_SET_FIELD(0x14, VC4_HD_MAI_THR_DREQHIGH) |
|
|
- VC4_SET_FIELD(0x12, VC4_HD_MAI_THR_DREQLOW));
|
|
- } else {
|
|
- HDMI_WRITE(HDMI_MAI_THR,
|
|
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
|
|
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
|
|
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) |
|
|
- VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW));
|
|
- }
|
|
+ /* Set the MAI threshold */
|
|
+ HDMI_WRITE(HDMI_MAI_THR,
|
|
+ VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICHIGH) |
|
|
+ VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_PANICLOW) |
|
|
+ VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQHIGH) |
|
|
+ VC4_SET_FIELD(0x10, VC4_HD_MAI_THR_DREQLOW));
|
|
|
|
HDMI_WRITE(HDMI_MAI_CONFIG,
|
|
VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
|