mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-22 06:57:57 +00:00
9703a2adcc
Refresh all patches on top of kernel 5.10.138. The following patches were applied upstream: bcm27xx/patches-5.10/950-0311-drm-vc4-Adopt-the-dma-configuration-from-the-HVS-or-.patch bcm27xx/patches-5.10/950-0317-vc4_hdmi-Remove-firmware-logic-for-MAI-threshold-set.patch bcm27xx/patches-5.10/950-0346-drm-vc4-A-present-but-empty-dmas-disables-audio.patch bcm27xx/patches-5.10/950-0354-drm-vc4-Add-the-2711-HVS-as-a-suitable-DMA-node.patch bcm27xx/patches-5.10/950-0413-drm-vc4-hdmi-Don-t-access-the-connector-state-in-res.patch bcm27xx/patches-5.10/950-0505-vc4-drm-Avoid-full-hdmi-audio-fifo-writes.patch bcm27xx/patches-5.10/950-0512-vc4-drm-vc4_plane-Remove-subpixel-positioning-check.patch bcm27xx/patches-5.10/950-0560-drm-vc4-drv-Remove-the-DSI-pointer-in-vc4_drv.patch bcm27xx/patches-5.10/950-0561-drm-vc4-dsi-Use-snprintf-for-the-PHY-clocks-instead-.patch bcm27xx/patches-5.10/950-0562-drm-vc4-dsi-Introduce-a-variant-structure.patch bcm27xx/patches-5.10/950-0565-drm-vc4-Correct-pixel-order-for-DSI0.patch bcm27xx/patches-5.10/950-0566-drm-vc4-Register-dsi0-as-the-correct-vc4-encoder-typ.patch bcm27xx/patches-5.10/950-0567-drm-vc4-Fix-dsi0-interrupt-support.patch bcm27xx/patches-5.10/950-0568-drm-vc4-Add-correct-stop-condition-to-vc4_dsi_encode.patch bcm27xx/patches-5.10/950-0647-drm-vc4-Fix-timings-for-interlaced-modes.patch bcm27xx/patches-5.10/950-0695-drm-vc4-Fix-margin-calculations-for-the-right-bottom.patch Upstream sets the pixel clock to 340MHz now, do not set it to 600MHz any more. bcm27xx/patches-5.10/950-0576-drm-vc4-hdmi-Raise-the-maximum-clock-rate.patch Fixes:89956c6532("kernel: bump 5.10 to 5.10.138") Fixes:4209c33ae2("kernel: bump 5.10 to 5.10.137") Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
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
|
|
@@ -1487,9 +1487,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 |
|
|
@@ -1922,7 +1919,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;
|
|
|