drm/i915/dp: Explicitly disable symbol scrambling while training
Subsystems (2)
PATCH 1/2 drm/i915/dp: Explicitly disable symbol scrambling while training
The DP spec says training patterns 1 and 2 are to be sent non-scrambled, and the GPU docs claim that happens (or at least, there's no explicit scrambling control). But the sink may be confused if we don't explicitly tell it what we're doing, so play it safe.
Signed-off-by Adam Jackson <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +4 -2
@@ -1369,7 +1369,8 @@ intel_dp_start_link_train(struct intel_dp *intel_dp) reg =DP |DP_LINK_TRAIN_PAT_1 ;if (!intel_dp_set_link_train (intel_dp, reg, -DP_TRAINING_PATTERN_1 )) +DP_TRAINING_PATTERN_1 | +DP_LINK_SCRAMBLING_DISABLE ))break ;/* Set training pattern 1 */
@@ -1444,7 +1445,8 @@ intel_dp_complete_link_train(struct intel_dp *intel_dp)/* channel eq pattern */ if (!intel_dp_set_link_train (intel_dp, reg, -DP_TRAINING_PATTERN_2 )) +DP_TRAINING_PATTERN_2 | +DP_LINK_SCRAMBLING_DISABLE ))break ;udelay (400 );
Signature · 1 line
1.7.6
PATCH 2/2 drm/i915/dp: Don't turn CPT DP ports on too early
The docs say the port has to come on in training pattern 1; at this point, though, ->DP is in normal mode. The intent here is to wait until the port is in fact sending data, but that doesn't happen since we've broken the sequence the hardware expects, and the vblank wait will time out and kvetch in the log.
Signed-off-by Adam Jackson <[email protected]>
--- drivers/gpu/drm/i915/intel_dp.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-)
drivers/gpu/drm/i915/intel_dp.c +10 -4
@@ -1333,10 +1333,16 @@ intel_dp_start_link_train(struct intel_dp *intel_dp)u32 reg;uint32_t DP = intel_dp->DP; -/* Enable output, wait for it to become active */ -I915_WRITE (intel_dp->output_reg, intel_dp->DP); -POSTING_READ (intel_dp->output_reg); -intel_wait_for_vblank (dev, intel_crtc->pipe); +/* +* On CPT we have to enable the port in training pattern 1, which +* will happen below in intel_dp_set_link_train. Otherwise, enable +* the port and wait for it to become active. +*/ +if (!HAS_PCH_CPT (dev)) { +I915_WRITE (intel_dp->output_reg, intel_dp->DP); +POSTING_READ (intel_dp->output_reg); +intel_wait_for_vblank (dev, intel_crtc->pipe); + }/* Write the link configuration data */ intel_dp_aux_native_write(intel_dp, DP_LINK_BW_SET,
Signature · 1 line
1.7.6