---

yaml --- r: 345241 b: refs/heads/master c: 0540e48 h: refs/heads/master i: 345239: 48d3411 v: v3
git-mirror · Nov 11, 2012 · f03b48e · f03b48e
1 parent e339092
commit f03b48e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cbfd0653005d6c7a8f00d8ef5573b2976157780
+refs/heads/master: 0540e4882f221d5979e02e2a225ad077ae8b40b4
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3183,8 +3183,7 @@ static void lpt_pch_enable(struct drm_crtc *crtc)
 
 	lpt_program_iclkip(crtc);
 
-	/* set transcoder timing, panel must allow it */
-	assert_panel_unlocked(dev_priv, pipe);
+	/* Set transcoder timing. */
 	I915_WRITE(TRANS_HTOTAL(pipe), I915_READ(HTOTAL(pipe)));
 	I915_WRITE(TRANS_HBLANK(pipe), I915_READ(HBLANK(pipe)));
 	I915_WRITE(TRANS_HSYNC(pipe),  I915_READ(HSYNC(pipe)));