From a3b94f79e4463c58973c36da0fb0244b02872c2c Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 7 Oct 2010 16:01:23 -0700 Subject: [PATCH] --- yaml --- r: 218301 b: refs/heads/master c: 895692befab73fd399d854c7db41d6d7260af2da h: refs/heads/master i: 218299: 3d42cac94eb969eaacd7f52c4e3d2abd0061995f v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_dp.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d88f00f52d01..fe256a5e75b5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 869184a675662bddcdf76c5b95665272facff2b8 +refs/heads/master: 895692befab73fd399d854c7db41d6d7260af2da diff --git a/trunk/drivers/gpu/drm/i915/intel_dp.c b/trunk/drivers/gpu/drm/i915/intel_dp.c index d4ef20598da8..ada7319f0eaf 100644 --- a/trunk/drivers/gpu/drm/i915/intel_dp.c +++ b/trunk/drivers/gpu/drm/i915/intel_dp.c @@ -775,7 +775,7 @@ intel_dp_mode_set(struct drm_encoder *encoder, struct drm_display_mode *mode, if (intel_crtc->pipe == 1 && !HAS_PCH_CPT(dev)) intel_dp->DP |= DP_PIPEB_SELECT; - if (is_edp(intel_dp)) { + if (is_edp(intel_dp) && !is_pch_edp(intel_dp)) { /* don't miss out required setting for eDP */ intel_dp->DP |= DP_PLL_ENABLE; if (adjusted_mode->clock < 200000)