mirror of
https://github.com/Ysurac/openmptcprouter.git
synced 2025-02-15 04:42:02 +00:00
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
From 4c78953fff281d78eabbd336a17bcded00d6316f Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime@cerno.tech>
|
|
Date: Fri, 25 Jun 2021 16:22:39 +0200
|
|
Subject: [PATCH 028/634] 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: c85695a2016e ("drm/vc4: hdmi: Enable the scrambler")
|
|
Signed-off-by: Maxime Ripard <maxime@cerno.tech>
|
|
---
|
|
drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
index 80ce69e0ead5..87870775471d 100644
|
|
--- a/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
+++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
|
|
@@ -180,6 +180,8 @@ static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi)
|
|
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)
|
|
{
|
|
@@ -216,6 +218,7 @@ vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
|
|
}
|
|
}
|
|
|
|
+ vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
|
|
pm_runtime_put(&vc4_hdmi->pdev->dev);
|
|
mutex_unlock(&vc4_hdmi->mutex);
|
|
return connector_status_connected;
|
|
--
|
|
2.33.1
|
|
|