mirror of
https://github.com/coolsnowwolf/lede.git
synced 2025-04-16 14:23:38 +00:00
eb73efcd3f
Deleted (upstreamed): bcm27xx/patches-5.10/950-0669-drm-vc4-hdmi-Make-sure-the-device-is-powered-with-CE.patch [1] bcm27xx/patches-5.10/950-0672-drm-vc4-hdmi-Move-initial-register-read-after-pm_run.patch [1] gemini/patches-5.10/0003-ARM-dts-gemini-NAS4220-B-fis-index-block-with-128-Ki.patch [2] Manually rebased: bcm27xx/patches-5.10/950-0675-drm-vc4-hdmi-Drop-devm-interrupt-handler-for-CEC-int.patch [1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=55b10b88ac8654fc2f31518aa349a2e643b37f18 [2] https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.94&id=958a8819d41420d7a74ed922a09cacc0ba3a4218 Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com> Co-authored-by: Rui Salvaterra <rsalvaterra@gmail.com>
45 lines
1.3 KiB
Diff
45 lines
1.3 KiB
Diff
From 8dda85398458dc330758ef5e1408d66995ffa068 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
|
|
@@ -1497,9 +1497,6 @@ 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 |
|
|
@@ -1934,7 +1931,6 @@ static const struct vc4_hdmi_variant bcm
|
|
.debugfs_name = "hdmi_regs",
|
|
.card_name = "vc4-hdmi",
|
|
.max_pixel_clock = 162000000,
|
|
- .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
|
|
@@ -43,9 +43,6 @@ struct vc4_hdmi_variant {
|
|
/* Filename to expose the registers in debugfs */
|
|
const char *debugfs_name;
|
|
|
|
- /* 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;
|
|
|