mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-21 22:47:56 +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>
55 lines
1.8 KiB
Diff
55 lines
1.8 KiB
Diff
From 6dda05f181e44d54b97fff75162f63d0fb84b944 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 25 Jun 2021 16:22:39 +0200
|
|
Subject: [PATCH] drm/vc4: hdmi: Enable the scrambler on reconnection
|
|
|
|
If we have a state already and disconnect/reconnect the display, the
|
|
SCDC messages won't be sent again since we didn't go through a disable /
|
|
enable cycle.
|
|
|
|
In order to fix this, let's call the vc4_hdmi_enable_scrambling function
|
|
in the detect callback if there is a mode and it needs the scrambler to
|
|
be enabled.
|
|
|
|
Fixes: 74465b84fa27 ("drm/vc4: hdmi: Enable the scrambler")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++++-
|
|
1 file changed, 9 insertions(+), 1 deletion(-)
|
|
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -170,6 +170,8 @@ static void vc4_hdmi_cec_update_clk_div(
|
|
static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {}
|
|
#endif
|
|
|
|
+static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder);
|
|
+
|
|
static enum drm_connector_status
|
|
vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
|
|
{
|
|
@@ -199,6 +201,8 @@ vc4_hdmi_connector_detect(struct drm_con
|
|
}
|
|
}
|
|
|
|
+ vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
|
|
+
|
|
pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
return connector_status_connected;
|
|
}
|
|
@@ -545,9 +549,13 @@ static bool vc4_hdmi_supports_scrambling
|
|
|
|
static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder)
|
|
{
|
|
- struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
|
|
+ struct drm_display_mode *mode;
|
|
struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
|
|
|
|
+ if (!encoder->crtc || !encoder->crtc->state)
|
|
+ return;
|
|
+
|
|
+ mode = &encoder->crtc->state->adjusted_mode;
|
|
if (!vc4_hdmi_supports_scrambling(encoder, mode))
|
|
return;
|
|
|