All of lore.kernel.org
 help / color / mirror / Atom feed
From: Maxime Ripard <maxime@cerno.tech>
To: dri-devel@lists.freedesktop.org,
	Maarten Lankhorst <maarten.lankhorst@linux.intel.com>,
	Thomas Zimmermann <tzimmermann@suse.de>,
	Maxime Ripard <maxime@cerno.tech>,
	Daniel Vetter <daniel.vetter@intel.com>,
	David Airlie <airlied@linux.ie>
Cc: linux-rpi-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org, Maxime Ripard <mripard@kernel.org>,
	Nicolas Saenz Julienne <nsaenz@kernel.org>,
	bcm-kernel-feedback-list@broadcom.com,
	Emma Anholt <emma@anholt.net>,
	Dave Stevenson <dave.stevenson@raspberrypi.com>,
	Phil Elwell <phil@raspberrypi.com>,
	Tim Gover <tim.gover@raspberrypi.com>,
	Dom Cobley <dom@raspberrypi.com>
Subject: [PATCH v8 09/10] drm/vc4: hdmi: Enable the scrambler on reconnection
Date: Mon, 25 Oct 2021 17:29:02 +0200	[thread overview]
Message-ID: <20211025152903.1088803-10-maxime@cerno.tech> (raw)
In-Reply-To: <20211025152903.1088803-1-maxime@cerno.tech>

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 d36b3b6ebed1..fab9b93e1b84 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.31.1


  parent reply	other threads:[~2021-10-25 15:29 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-10-25 15:28 [PATCH v8 00/10] drm/vc4: hdmi: Support the 4k @ 60Hz modes Maxime Ripard
2021-10-25 15:28 ` [PATCH v8 01/10] drm/vc4: hdmi: Remove the DDC probing for status detection Maxime Ripard
2021-11-02 17:25   ` Dave Stevenson
2021-11-02 17:25     ` Dave Stevenson
2021-10-25 15:28 ` [PATCH v8 02/10] drm/vc4: hdmi: Fix HPD GPIO detection Maxime Ripard
2021-11-02 16:15   ` Dave Stevenson
2021-11-02 16:15     ` Dave Stevenson
2021-10-25 15:28 ` [PATCH v8 03/10] drm/vc4: Make vc4_crtc_get_encoder public Maxime Ripard
2021-11-02 16:21   ` Dave Stevenson
2021-11-02 16:21     ` Dave Stevenson
2021-10-25 15:28 ` [PATCH v8 04/10] drm/vc4: crtc: Add encoder to vc4_crtc_config_pv prototype Maxime Ripard
2021-11-02 16:25   ` Dave Stevenson
2021-11-02 16:25     ` Dave Stevenson
2021-10-25 15:28 ` [PATCH v8 05/10] drm/vc4: crtc: Rework the encoder retrieval code (again) Maxime Ripard
2021-11-02 16:32   ` Dave Stevenson
2021-11-02 16:32     ` Dave Stevenson
2021-10-25 15:28 ` [PATCH v8 06/10] drm/vc4: crtc: Add some logging Maxime Ripard
2021-11-02 16:33   ` Dave Stevenson
2021-11-02 16:33     ` Dave Stevenson
2021-10-25 15:29 ` [PATCH v8 07/10] drm/vc4: Leverage the load tracker on the BCM2711 Maxime Ripard
2021-11-02 16:46   ` Dave Stevenson
2021-11-02 16:46     ` Dave Stevenson
2021-10-25 15:29 ` [PATCH v8 08/10] drm/vc4: hdmi: Raise the maximum clock rate Maxime Ripard
2021-10-25 15:29 ` Maxime Ripard [this message]
2021-11-02 16:51   ` [PATCH v8 09/10] drm/vc4: hdmi: Enable the scrambler on reconnection Dave Stevenson
2021-11-02 16:51     ` Dave Stevenson
2021-10-25 15:29 ` [PATCH v8 10/10] drm/vc4: Increase the core clock based on HVS load Maxime Ripard
2021-11-02 17:12   ` Dave Stevenson
2021-11-02 17:12     ` Dave Stevenson
2021-11-04  9:43 ` [PATCH v8 00/10] drm/vc4: hdmi: Support the 4k @ 60Hz modes Maxime Ripard
2021-11-04  9:43   ` Maxime Ripard

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20211025152903.1088803-10-maxime@cerno.tech \
    --to=maxime@cerno.tech \
    --cc=airlied@linux.ie \
    --cc=bcm-kernel-feedback-list@broadcom.com \
    --cc=daniel.vetter@intel.com \
    --cc=dave.stevenson@raspberrypi.com \
    --cc=dom@raspberrypi.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=emma@anholt.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-rpi-kernel@lists.infradead.org \
    --cc=maarten.lankhorst@linux.intel.com \
    --cc=mripard@kernel.org \
    --cc=nsaenz@kernel.org \
    --cc=phil@raspberrypi.com \
    --cc=tim.gover@raspberrypi.com \
    --cc=tzimmermann@suse.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.