openwrt/target/linux/bcm27xx/patches-5.4/950-0583-drm-vc4-hdmi-Add-an-audio-support-flag.patch
Álvaro Fernández Rojas 62b7f5931c bcm27xx: import latest patches from the RPi foundation
bcm2708: boot tested on RPi B+ v1.2
bcm2709: boot tested on RPi 3B v1.2 and RPi 4B v1.1 4G
bcm2710: boot tested on RPi 3B v1.2
bcm2711: boot tested on RPi 4B v1.1 4G

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
(cherry-picked from commit f07e572f64)
2021-02-19 07:17:21 +01:00

48 lines
1.4 KiB
Diff

From 6154f7383e2defe48eea7fddb6ce646a0069828b Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime@cerno.tech>
Date: Thu, 6 Feb 2020 16:21:45 +0100
Subject: [PATCH] drm/vc4: hdmi: Add an audio support flag
The BCM2711 audio support doesn't work yet, so let's add a boolean to
indicate whether or not it's supported, and only register a sound card if
that boolean is set.
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
---
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ++++
drivers/gpu/drm/vc4/vc4_hdmi.h | 3 +++
2 files changed, 7 insertions(+)
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
@@ -944,6 +944,9 @@ static int vc4_hdmi_audio_init(struct vc
int ret;
int len;
+ if (!vc4_hdmi->variant->audio_available)
+ return 0;
+
if (!of_find_property(dev->of_node, "dmas", &len) ||
len == 0) {
dev_warn(dev,
@@ -1445,6 +1448,7 @@ static int vc4_hdmi_dev_remove(struct pl
}
static const struct vc4_hdmi_variant bcm2835_variant = {
+ .audio_available = true,
.registers = vc4_hdmi_fields,
.num_registers = ARRAY_SIZE(vc4_hdmi_fields),
--- a/drivers/gpu/drm/vc4/vc4_hdmi.h
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.h
@@ -32,6 +32,9 @@ struct vc4_hdmi_variant {
*/
unsigned int id;
+ /* Set to true when the audio support is available */
+ bool audio_available;
+
/* List of the registers available on that variant */
const struct vc4_hdmi_register *registers;