48 lines
1.5 KiB
Diff
48 lines
1.5 KiB
Diff
From 0f626dc8443a93138806b4a3f351bac346036358 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Thu, 6 Feb 2020 16:22:50 +0100
|
|
Subject: [PATCH] drm/vc4: hdmi: Add CEC support flag
|
|
|
|
Similarly to the audio support, CEC support is not there yet for the
|
|
BCM2711, so let's skip entirely the CEC initialization through a variant
|
|
flag.
|
|
|
|
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
|
|
@@ -1187,6 +1187,9 @@ static int vc4_hdmi_cec_init(struct vc4_
|
|
u32 value;
|
|
int ret;
|
|
|
|
+ if (!vc4_hdmi->variant->cec_available)
|
|
+ return 0;
|
|
+
|
|
vc4_hdmi->cec_adap = cec_allocate_adapter(&vc4_hdmi_cec_adap_ops,
|
|
vc4_hdmi, "vc4",
|
|
CEC_CAP_DEFAULTS |
|
|
@@ -1475,6 +1478,7 @@ static int vc4_hdmi_dev_remove(struct pl
|
|
|
|
static const struct vc4_hdmi_variant bcm2835_variant = {
|
|
.audio_available = true,
|
|
+ .cec_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
|
|
@@ -35,6 +35,9 @@ struct vc4_hdmi_variant {
|
|
/* Set to true when the audio support is available */
|
|
bool audio_available;
|
|
|
|
+ /* Set to true when the CEC support is available */
|
|
+ bool cec_available;
|
|
+
|
|
/* List of the registers available on that variant */
|
|
const struct vc4_hdmi_register *registers;
|
|
|