]> git.karo-electronics.de Git - linux-beck.git/commitdiff
drm/i915: don't send DP "idle" pattern before "normal" on HSW PORT_A
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Tue, 29 Jan 2013 18:35:18 +0000 (16:35 -0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 31 Jan 2013 10:50:10 +0000 (11:50 +0100)
The DP_TP_STATUS register for PORT_A doesn't exist. Our documentation
will be fixed soon, so the code does not match it for now.

This solves "Timed out waiting for DP idle patterns" and "unclaimed
register" messages on eDP.

V1: Was called "drm/i915: don't read DP_TP_STATUS(PORT_A)"
V2: Was called "drm/i915: don't send DP idle pattern before normal
pattern on HSW"
V3: Only change the code that touches PORT_A.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_dp.c

index 51fd79758368631ad8a308d9990167277877ef6f..1b76b04787c796646c87c73ed13d30acf61258c0 100644 (file)
@@ -1785,14 +1785,18 @@ intel_dp_set_link_train(struct intel_dp *intel_dp,
                temp &= ~DP_TP_CTL_LINK_TRAIN_MASK;
                switch (dp_train_pat & DP_TRAINING_PATTERN_MASK) {
                case DP_TRAINING_PATTERN_DISABLE:
-                       temp |= DP_TP_CTL_LINK_TRAIN_IDLE;
-                       I915_WRITE(DP_TP_CTL(port), temp);
 
-                       if (wait_for((I915_READ(DP_TP_STATUS(port)) &
-                                     DP_TP_STATUS_IDLE_DONE), 1))
-                               DRM_ERROR("Timed out waiting for DP idle patterns\n");
+                       if (port != PORT_A) {
+                               temp |= DP_TP_CTL_LINK_TRAIN_IDLE;
+                               I915_WRITE(DP_TP_CTL(port), temp);
+
+                               if (wait_for((I915_READ(DP_TP_STATUS(port)) &
+                                             DP_TP_STATUS_IDLE_DONE), 1))
+                                       DRM_ERROR("Timed out waiting for DP idle patterns\n");
+
+                               temp &= ~DP_TP_CTL_LINK_TRAIN_MASK;
+                       }
 
-                       temp &= ~DP_TP_CTL_LINK_TRAIN_MASK;
                        temp |= DP_TP_CTL_LINK_TRAIN_NORMAL;
 
                        break;