---

yaml --- r: 228784 b: refs/heads/master c: 160b154 h: refs/heads/master v: v3
git-mirror · Dec 5, 2010 · 8ba3318 · 8ba3318
1 parent 119f6ce
commit 8ba3318
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5aa7d52aebfc11760bbc5b081ed621227bb77981
+refs/heads/master: 160b1543cdae83e9f8914ac7afc3d2bd686140af
diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c
@@ -1374,7 +1374,6 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 {
 	struct drm_device *dev = intel_dp->base.base.dev;
 	struct drm_i915_private *dev_priv = dev->dev_private;
-	struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc);
 	uint32_t DP = intel_dp->DP;
 
 	DRM_DEBUG_KMS("\n");
@@ -1401,6 +1400,8 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 		DP |= DP_LINK_TRAIN_OFF;
 
 	if (!HAS_PCH_CPT(dev) && (DP & DP_PIPEB_SELECT)) {
+		struct intel_crtc *intel_crtc = to_intel_crtc(intel_dp->base.base.crtc);
+
 		/* Hardware workaround: leaving our transcoder select
 		 * set to transcoder B while it's off will prevent the
 		 * corresponding HDMI output on transcoder A.
@@ -1415,8 +1416,7 @@ intel_dp_link_down(struct intel_dp *intel_dp)
 		/* Changes to enable or select take place the vblank
 		 * after being written.
 		 */
-		intel_wait_for_vblank(intel_dp->base.base.dev,
-				      intel_crtc->pipe);
+		intel_wait_for_vblank(dev, intel_crtc->pipe);
 	}
 
 	I915_WRITE(intel_dp->output_reg, DP & ~DP_PORT_EN);