From: Imre Deak Date: Wed, 8 May 2013 10:14:03 +0000 (+0300) Subject: drm/i915: hsw: replace !is_pch_edp() with port==PORT_A X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=d8e8b582b4e685a0e2a95ca0f4862582d465c649;p=openwrt%2Fstaging%2Fblogic.git drm/i915: hsw: replace !is_pch_edp() with port==PORT_A On HSW the CPU side eDP is always on port-A, the PCH side eDP is always on port-D. Signed-off-by: Imre Deak Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index b89072252b6c..157a68f48060 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -5969,7 +5969,7 @@ static int haswell_crtc_mode_set(struct drm_crtc *crtc, for_each_encoder_on_crtc(dev, crtc, encoder) { switch (encoder->type) { case INTEL_OUTPUT_EDP: - if (!intel_encoder_is_pch_edp(&encoder->base)) + if (enc_to_dig_port(&encoder->base)->port == PORT_A) is_cpu_edp = true; break; }