All of lore.kernel.org
 help / color / mirror / Atom feed
* [RESEND] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status
@ 2026-05-20  2:25 Ankit Nautiyal
  2026-05-29  4:56 ` Jerome Tollet
  0 siblings, 1 reply; 32+ messages in thread
From: Ankit Nautiyal @ 2026-05-20  2:25 UTC (permalink / raw)
  To: intel-gfx, intel-xe
  Cc: Jerome Tollet, Jerome Tollet, Ankit Nautiyal, Arun R Murthy

From: Jerome Tollet <jerome.tollet@gmail.com>

HDMI 2.0 section 6.1.3.1 specifies that after enabling
Scrambling_Enable and starting scrambled video transmission, the source
should poll Scrambling_Status until it reads 1 or until a timeout of
200 ms expires.

Add a polling step after enabling the HDMI port to check the scrambling
status when HDMI scrambling is enabled.

On some HDMI 2.0 sinks, omitting this check can result in 4K@60Hz
(594 MHz) failing to come up correctly because the sink has not yet
finished its scrambling setup. In practice, waiting for the scrambling
status here fixes such sinks.

While this synchronous polling is not itself explicitly required for
correct modeset sequencing, HDMI 2.0 section 6.1.3.1 does recommend it
as the way for the source to verify that the TMDS link is functioning
correctly with scrambling enabled.

v3:
 - Add explicit HDMI 2.0 section reference in code comment
 - Clarify commit message around the observed sink fix

v2:
 - Poll TMDS_Scrambler_Status for up to 200 ms instead of using a fixed
   delay

Reported-by: Jerome Tollet <jtollet@cisco.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6868
Link: https://lore.kernel.org/dri-devel/20251230091037.5603-1-jerome.tollet@gmail.com/
Signed-off-by: Jerome Tollet <jerome.tollet@gmail.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
Reviewed-by: Arun R Murthy <arun.r.murthy@intel.com>
---

Resend to intel-gfx and intel-xe so that the patch is picked
up by intel gfx CI.

---
 drivers/gpu/drm/i915/display/intel_ddi.c  |  2 ++
 drivers/gpu/drm/i915/display/intel_hdmi.c | 26 +++++++++++++++++++++++
 drivers/gpu/drm/i915/display/intel_hdmi.h |  2 ++
 3 files changed, 30 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index 86520848892e..ac307a53576b 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3505,6 +3505,8 @@ static void intel_ddi_enable_hdmi(struct intel_atomic_state *state,
 	}
 
 	intel_ddi_buf_enable(encoder, buf_ctl);
+
+	intel_hdmi_poll_for_scrambling_enable(crtc_state, connector);
 }
 
 static void intel_ddi_enable(struct intel_atomic_state *state,
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 9076c2b176ec..b9d11fb8559d 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -2728,6 +2728,32 @@ intel_hdmi_add_properties(struct intel_hdmi *intel_hdmi, struct drm_connector *_
 		drm_connector_attach_max_bpc_property(&connector->base, 8, 12);
 }
 
+/*
+ * HDMI 2.0 spec, section 6.1.3.1 (Scrambling Control): after
+ * enabling Scrambling_Enable and starting scrambled video
+ * transmission, poll Scrambling_Status for up to 200 ms.
+ */
+void
+intel_hdmi_poll_for_scrambling_enable(const struct intel_crtc_state *crtc_state,
+				      struct drm_connector *_connector)
+{
+	struct intel_connector *connector = to_intel_connector(_connector);
+	struct intel_display *display = to_intel_display(crtc_state);
+	bool scrambling_enabled = false;
+	int ret;
+
+	if (!crtc_state->hdmi_scrambling)
+		return;
+
+	/* Poll for a max of 200 msec as per HDMI spec */
+	ret = poll_timeout_us(scrambling_enabled = drm_scdc_get_scrambling_status(&connector->base),
+			      scrambling_enabled, 1000, 200 * 1000, false);
+	if (ret)
+		drm_dbg_kms(display->drm,
+			    "[CONNECTOR:%d:%s] Timed out waiting for scrambling enable\n",
+			    connector->base.base.id, connector->base.name);
+}
+
 /*
  * intel_hdmi_handle_sink_scrambling: handle sink scrambling/clock ratio setup
  * @encoder: intel_encoder
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
index be2fad57e4ad..0fa3661568e8 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.h
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
@@ -70,5 +70,7 @@ void hsw_read_infoframe(struct intel_encoder *encoder,
 			const struct intel_crtc_state *crtc_state,
 			unsigned int type,
 			void *frame, ssize_t len);
+void intel_hdmi_poll_for_scrambling_enable(const struct intel_crtc_state *crtc_state,
+					   struct drm_connector *_connector);
 
 #endif /* __INTEL_HDMI_H__ */
-- 
2.45.2


^ permalink raw reply related	[flat|nested] 32+ messages in thread
[parent not found: <[email protected]>]
* Re: [RESEND] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status
@ 2026-01-28 10:12 Jérôme Tollet
  2026-02-07  3:14 ` Jérôme Tollet
  0 siblings, 1 reply; 32+ messages in thread
From: Jérôme Tollet @ 2026-01-28 10:12 UTC (permalink / raw)
  To: intel-gfx; +Cc: ville.syrjala, Ankit Nautiyal

Hi Ville,
Following Ankit's response on January 21st where he suggested
considering a panel-specific quirk instead of a generic solution, I
wanted to get your input on the preferred approach.
As a reminder, testing showed the delay works at any placement in the
modeset sequence (all 4 test positions succeeded), suggesting this is
a timing issue rather than being tied to a specific operation.

Three approaches are available:
1. Generic SCDC polling after port enable - aligns with Windows
behavior which also performs ~200ms SCDC poll post-enable
2. Panel-specific quirk for affected displays (Cisco Desk Pro in my case)
3. Fixed delay after SCDC config (my v2 patch from Jan 14)

I'm happy with any approach that gets merged.

Thanks
Jerome

^ permalink raw reply	[flat|nested] 32+ messages in thread
* [RESEND] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status
@ 2026-01-13 13:38 Ankit Nautiyal
  2026-01-13 14:01 ` ✓ CI.KUnit: success for " Patchwork
                   ` (7 more replies)
  0 siblings, 8 replies; 32+ messages in thread
From: Ankit Nautiyal @ 2026-01-13 13:38 UTC (permalink / raw)
  To: intel-gfx, intel-xe
  Cc: jani.nikula, ville.syrjala, Jerome Tollet, Ankit Nautiyal

From: Jerome Tollet <jerome.tollet@gmail.com>

As per HDMI 2.0 specification, after scrambled video transmission begins,
the source must poll the TMDS_Scrambler_Status bit until it reads 1 or
until a timeout of 200 ms.

Add a polling step after enabling the HDMI port to verify scrambling
status, following the spec requirement.

Without the wait for the scrambling bit to set, some HDMI 2.0 monitors fail
to decode the signal at 4K@60Hz (594 MHz) when SCDC scrambling is not yet
fully configured by the sink.

v2:
 - Instead of the fixed delay, poll for TMDS scramble status for 200 msec
   as per the HDMI spec. (Ankit)

Reported-by: Jerome Tollet <jerome.tollet@gmail.com>
Closes: https://gitlab.freedesktop.org/drm/xe/kernel/-/issues/6868
Link: https://lore.kernel.org/dri-devel/20251230091037.5603-1-jerome.tollet@gmail.com/
Signed-off-by: Jerome Tollet <jerome.tollet@gmail.com>
Signed-off-by: Ankit Nautiyal <ankit.k.nautiyal@intel.com>
---

Rebased and resend to intel-gfx and intel-xe so that the patch is picked
up by intel gfx CI.

---
 drivers/gpu/drm/i915/display/intel_ddi.c  |  2 ++
 drivers/gpu/drm/i915/display/intel_hdmi.c | 25 +++++++++++++++++++++++
 drivers/gpu/drm/i915/display/intel_hdmi.h |  2 ++
 3 files changed, 29 insertions(+)

diff --git a/drivers/gpu/drm/i915/display/intel_ddi.c b/drivers/gpu/drm/i915/display/intel_ddi.c
index cb91d07cdaa6..c708b713f0e8 100644
--- a/drivers/gpu/drm/i915/display/intel_ddi.c
+++ b/drivers/gpu/drm/i915/display/intel_ddi.c
@@ -3506,6 +3506,8 @@ static void intel_ddi_enable_hdmi(struct intel_atomic_state *state,
 	}
 
 	intel_ddi_buf_enable(encoder, buf_ctl);
+
+	intel_hdmi_poll_for_scrambling_enable(crtc_state, connector);
 }
 
 static void intel_ddi_enable(struct intel_atomic_state *state,
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.c b/drivers/gpu/drm/i915/display/intel_hdmi.c
index 055e68810d0d..6f7dcd7365a4 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.c
@@ -3363,3 +3363,28 @@ intel_hdmi_dsc_get_bpp(int src_fractional_bpp, int slice_width, int num_slices,
 
 	return 0;
 }
+
+/*
+ * As Per HDMI 2.0 spec: after scrambled video transmission begins,
+ * poll TMDS_Scrambler_Status until it reads 1, for up to 200 ms.
+ */
+void
+intel_hdmi_poll_for_scrambling_enable(const struct intel_crtc_state *crtc_state,
+				      struct drm_connector *_connector)
+{
+	struct intel_connector *connector = to_intel_connector(_connector);
+	struct intel_display *display = to_intel_display(crtc_state);
+	bool scrambling_enabled = false;
+	int ret;
+
+	if (!crtc_state->hdmi_scrambling)
+		return;
+
+	/* Poll for a max of 200 msec as per HDMI spec */
+	ret = poll_timeout_us(scrambling_enabled = drm_scdc_get_scrambling_status(&connector->base),
+			      scrambling_enabled, 1000, 200 * 1000, false);
+	if (ret)
+		drm_dbg_kms(display->drm,
+			    "[CONNECTOR:%d:%s] Timed out waiting for scrambling enable\n",
+			    connector->base.base.id, connector->base.name);
+}
diff --git a/drivers/gpu/drm/i915/display/intel_hdmi.h b/drivers/gpu/drm/i915/display/intel_hdmi.h
index be2fad57e4ad..0fa3661568e8 100644
--- a/drivers/gpu/drm/i915/display/intel_hdmi.h
+++ b/drivers/gpu/drm/i915/display/intel_hdmi.h
@@ -70,5 +70,7 @@ void hsw_read_infoframe(struct intel_encoder *encoder,
 			const struct intel_crtc_state *crtc_state,
 			unsigned int type,
 			void *frame, ssize_t len);
+void intel_hdmi_poll_for_scrambling_enable(const struct intel_crtc_state *crtc_state,
+					   struct drm_connector *_connector);
 
 #endif /* __INTEL_HDMI_H__ */
-- 
2.45.2


^ permalink raw reply related	[flat|nested] 32+ messages in thread
end of thread, other threads:[~2026-06-01 14:40 UTC | newest]

Thread overview: 32+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
     [not found] <20260113143107.1446909-1-ankit.k.nautiyal@intel.com>
2026-03-26  5:41 ` [RESEND] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status Jerome Tollet
2026-04-01 11:23   ` Ville Syrjälä
2026-04-01 12:26     ` Jerome Tollet
2026-04-17 14:14 ` [PATCH v3] " Jerome Tollet
2026-04-20 20:15 ` ✗ LGCI.VerificationFailed: failure for drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status (rev3) Patchwork
2026-04-21  1:45 ` ✗ LGCI.VerificationFailed: failure for drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status (rev2) Patchwork
2026-05-05  5:37 ` [RESEND] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status Jerome Tollet
2026-05-06 10:11 ` ✗ LGCI.VerificationFailed: failure for drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status (rev4) Patchwork
2026-05-07 15:55 ` [PATCH] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status Jerome Tollet
2026-05-20  2:25 [RESEND] " Ankit Nautiyal
2026-05-29  4:56 ` Jerome Tollet
     [not found] <[email protected]>
2026-02-21  7:37 ` Jerome Tollet
  -- strict thread matches above, loose matches on Subject: below --
2026-01-28 10:12 Jérôme Tollet
2026-02-07  3:14 ` Jérôme Tollet
2026-02-14 16:17   ` Jérôme Tollet
2026-02-17  8:14     ` Nautiyal, Ankit K
2026-01-13 13:38 Ankit Nautiyal
2026-01-13 14:01 ` ✓ CI.KUnit: success for " Patchwork
2026-01-13 14:48 ` ✓ i915.CI.BAT: " Patchwork
2026-01-13 14:48 ` ✓ Xe.CI.BAT: " Patchwork
2026-01-13 20:56 ` ✗ i915.CI.Full: failure " Patchwork
2026-01-13 21:39 ` [RESEND] " Ville Syrjälä
2026-01-14  7:17   ` [PATCH v2] drm/i915/hdmi: Add SCDC processing delay for scrambling setup Jerome Tollet
2026-01-21 12:56   ` [RESEND] drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status Nautiyal, Ankit K
2026-02-19 15:45     ` Jerome Tollet
2026-02-27 13:16     ` Jerome Tollet
2026-02-27 14:03       ` Nautiyal, Ankit K
2026-03-10 20:47     ` Jerome Tollet
2026-03-10 20:47     ` Jerome Tollet
2026-01-13 22:40 ` ✗ Xe.CI.Full: failure for " Patchwork
2026-04-01 12:11 ` ✓ i915.CI.BAT: success for drm/i915/hdmi: Poll for 200 msec for TMDS_Scrambler_Status (rev2) Patchwork
2026-04-02  4:23 ` ✓ i915.CI.Full: " Patchwork

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.