mirror of
https://git.openwrt.org/openwrt/openwrt.git
synced 2024-11-25 06:26:15 +00:00
51db334005
Changelog: https://cdn.kernel.org/pub/linux/kernel/v6.x/ChangeLog-6.6.54 Removed upstreamed: generic/backport-6.6/780-24-v6.12-r8169-disable-ALDPS-per-default-for-RTL8125.patch[1] generic/pending-6.6/360-selftests-bpf-portability-of-unprivileged-tests.patch[2] Manually rebased: bcm53xx/patches-6.6/180-usb-xhci-add-support-for-performing-fake-doorbell.patch bmips/patches-6.6/200-mips-bmips-automatically-detect-CPU-frequency.patch All other patches automatically rebased. 1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.54&id=50d062b6cc90c45a0de54e9bd9903c82777d66bf 2. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v6.6.54&id=103c0431c7fb4790affea121126840dbfb146341 Build system: x86/64 Build-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Run-tested: x86/64/AMD Cezanne, flogic/xiaomi_redmi-router-ax6000-ubootmod, ramips/tplink_archer-a6-v3 Signed-off-by: John Audia <therealgraysky@proton.me> Link: https://github.com/openwrt/openwrt/pull/16602 Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
51 lines
1.9 KiB
Diff
51 lines
1.9 KiB
Diff
From 66372055ffda939ce52ddc64270079dd4f04d764 Mon Sep 17 00:00:00 2001
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
Date: Fri, 21 Apr 2023 22:00:16 +0100
|
|
Subject: [PATCH 0468/1085] drm/vc4: hdmi: Increase MAI fifo dreq threshold
|
|
|
|
Now we wait for write responses and have a burst
|
|
size of 4, we can set the fifo threshold much higher.
|
|
|
|
Set it to 28 (of the 32 entry size) to keep fifo
|
|
fuller and reduce chance of underflow.
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 18 +++++++++++++-----
|
|
1 file changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -2527,6 +2527,7 @@ static int vc4_hdmi_audio_prepare(struct
|
|
{
|
|
struct vc4_hdmi *vc4_hdmi = dev_get_drvdata(dev);
|
|
struct drm_device *drm = vc4_hdmi->connector.dev;
|
|
+ struct vc4_dev *vc4 = to_vc4_dev(drm);
|
|
struct drm_encoder *encoder = &vc4_hdmi->encoder.base;
|
|
unsigned int sample_rate = params->sample_rate;
|
|
unsigned int channels = params->channels;
|
|
@@ -2585,11 +2586,18 @@ static int vc4_hdmi_audio_prepare(struct
|
|
VC4_HDMI_AUDIO_PACKET_CEA_MASK);
|
|
|
|
/* Set the MAI threshold */
|
|
- HDMI_WRITE(HDMI_MAI_THR,
|
|
- VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICHIGH) |
|
|
- VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_PANICLOW) |
|
|
- VC4_SET_FIELD(0x06, VC4_HD_MAI_THR_DREQHIGH) |
|
|
- VC4_SET_FIELD(0x08, VC4_HD_MAI_THR_DREQLOW));
|
|
+ if (vc4->is_vc5)
|
|
+ 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(0x1c, VC4_HD_MAI_THR_DREQHIGH) |
|
|
+ VC4_SET_FIELD(0x1c, VC4_HD_MAI_THR_DREQLOW));
|
|
+ else
|
|
+ HDMI_WRITE(HDMI_MAI_THR,
|
|
+ VC4_SET_FIELD(0x8, VC4_HD_MAI_THR_PANICHIGH) |
|
|
+ VC4_SET_FIELD(0x8, VC4_HD_MAI_THR_PANICLOW) |
|
|
+ VC4_SET_FIELD(0x6, VC4_HD_MAI_THR_DREQHIGH) |
|
|
+ VC4_SET_FIELD(0x8, VC4_HD_MAI_THR_DREQLOW));
|
|
|
|
HDMI_WRITE(HDMI_MAI_CONFIG,
|
|
VC4_HDMI_MAI_CONFIG_BIT_REVERSE |
|