mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-28 01:28:59 +00: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>
34 lines
1.0 KiB
Diff
34 lines
1.0 KiB
Diff
From 4de61df3c777ea6265d03be98b315c8644003ceb Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.org>
|
|
Date: Wed, 31 Jul 2019 17:36:34 +0100
|
|
Subject: [PATCH] drm/vc4: A present but empty dmas disables audio
|
|
|
|
Overlays are unable to remove properties in the base DTB, but they
|
|
can overwrite them. Allow a present but empty 'dmas' property
|
|
to also disable the HDMI audio interface.
|
|
|
|
See: https://github.com/raspberrypi/linux/issues/2489
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.org>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 6 ++++--
|
|
1 file changed, 4 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -1333,10 +1333,12 @@ static int vc4_hdmi_audio_init(struct vc
|
|
const __be32 *addr;
|
|
int index;
|
|
int ret;
|
|
+ int len;
|
|
|
|
- if (!of_find_property(dev->of_node, "dmas", NULL)) {
|
|
+ if (!of_find_property(dev->of_node, "dmas", &len) ||
|
|
+ len == 0) {
|
|
dev_warn(dev,
|
|
- "'dmas' DT property is missing, no HDMI audio\n");
|
|
+ "'dmas' DT property is missing or empty, no HDMI audio\n");
|
|
return 0;
|
|
}
|
|
|