2020-05-27 13:12:04 +00:00
|
|
|
From c214fa3d1bc1142cb8f185f71deb3f14915fe55d Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
Date: Thu, 7 May 2020 18:16:09 +0100
|
|
|
|
|
Subject: [PATCH] vc4_hdmi: Remove cec_available flag as always
|
|
|
|
|
supported
|
|
|
|
|
|
|
|
|
|
Signed-off-by: Dom Cobley <popcornmix@gmail.com>
|
|
|
|
|
---
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 4 ----
|
|
|
|
|
drivers/gpu/drm/vc4/vc4_hdmi.h | 3 ---
|
|
|
|
|
2 files changed, 7 deletions(-)
|
|
|
|
|
|
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
|
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
2020-10-01 13:22:00 +00:00
|
|
|
@@ -1403,9 +1403,6 @@ static int vc4_hdmi_cec_init(struct vc4_
|
2020-05-27 13:12:04 +00:00
|
|
|
u32 clk_cnt;
|
|
|
|
|
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 |
|
2020-10-01 13:22:00 +00:00
|
|
|
@@ -1774,7 +1771,6 @@ static const struct vc4_hdmi_variant bcm
|
2020-05-27 13:12:04 +00:00
|
|
|
.max_pixel_clock = 162000000,
|
|
|
|
|
.cec_input_clock = VC4_HSM_CLOCK,
|
|
|
|
|
.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
|
|
|
|
|
@@ -42,9 +42,6 @@ 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;
|
|
|
|
|
-
|
|
|
|
|
/* Maximum pixel clock supported by the controller (in Hz) */
|
|
|
|
|
unsigned long long max_pixel_clock;
|
|
|
|
|
|
