---

yaml --- r: 218296 b: refs/heads/master c: 8324012 h: refs/heads/master v: v3
git-mirror · Oct 8, 2010 · 1543acc · 1543acc
1 parent 642e4be
commit 1543acc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1cb1b75e5e0120cc35c4a9420ce366b84e0cf951
+refs/heads/master: 83240120878805b537a2efeaabff92798140b7cf
diff --git a/trunk/drivers/gpu/drm/i915/intel_display.c b/trunk/drivers/gpu/drm/i915/intel_display.c
@@ -3850,7 +3850,7 @@ static int intel_crtc_mode_set(struct drm_crtc *crtc,
 			}
 			dpll |= DPLL_DVO_HIGH_SPEED;
 		}
-		if (is_dp)
+		if (is_dp || intel_encoder_is_pch_edp(&has_edp_encoder->base))
 			dpll |= DPLL_DVO_HIGH_SPEED;
 
 		/* compute bitmask from p1 value */