target/linux/bcm27xx/patches-5.10/950-0655-drm-vc4-hdmi-Enable-the-scrambler-on-reconnection.patch

   1 From 6dda05f181e44d54b97fff75162f63d0fb84b944 Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime@cerno.tech>
   3 Date: Fri, 25 Jun 2021 16:22:39 +0200
   4 Subject: [PATCH] drm/vc4: hdmi: Enable the scrambler on reconnection
   5
   6 If we have a state already and disconnect/reconnect the display, the
   7 SCDC messages won't be sent again since we didn't go through a disable /
   8 enable cycle.
   9
  10 In order to fix this, let's call the vc4_hdmi_enable_scrambling function
  11 in the detect callback if there is a mode and it needs the scrambler to
  12 be enabled.
  13
  14 Fixes: 74465b84fa27 ("drm/vc4: hdmi: Enable the scrambler")
  15 Signed-off-by: Maxime Ripard <maxime@cerno.tech>
  16 ---
  17  drivers/gpu/drm/vc4/vc4_hdmi.c | 10 +++++++++-
  18  1 file changed, 9 insertions(+), 1 deletion(-)
  19
  20 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c
  21 +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c
  22 @@ -167,6 +167,8 @@ static void vc4_hdmi_cec_update_clk_div(
  23  static void vc4_hdmi_cec_update_clk_div(struct vc4_hdmi *vc4_hdmi) {}
  24  #endif
  25
  26 +static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder);
  27 +
  28  static enum drm_connector_status
  29  vc4_hdmi_connector_detect(struct drm_connector *connector, bool force)
  30  {
  31 @@ -196,6 +198,8 @@ vc4_hdmi_connector_detect(struct drm_con
  32                         }
  33                 }
  34
  35 +               vc4_hdmi_enable_scrambling(&vc4_hdmi->encoder.base.base);
  36 +
  37                 pm_runtime_put(&vc4_hdmi->pdev->dev);
  38                 return connector_status_connected;
  39         }
  40 @@ -542,9 +546,13 @@ static bool vc4_hdmi_supports_scrambling
  41
  42  static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder)
  43  {
  44 -       struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode;
  45 +       struct drm_display_mode *mode;
  46         struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder);
  47
  48 +       if (!encoder->crtc || !encoder->crtc->state)
  49 +               return;
  50 +
  51 +       mode = &encoder->crtc->state->adjusted_mode;
  52         if (!vc4_hdmi_supports_scrambling(encoder, mode))
  53                 return;
  54