From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 05:13:45 +0000 (+1100)
Subject: Merge remote-tracking branch 'drm-intel/for-linux-next'
X-Git-Tag: next-20140106~53
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=08cc4b4af3c1462e104216f7990534c3be3c724e;p=karo-tx-linux.git

Merge remote-tracking branch 'drm-intel/for-linux-next'

Conflicts:
	drivers/gpu/drm/i915/intel_ddi.c
	drivers/gpu/drm/i915/intel_pm.c
---

08cc4b4af3c1462e104216f7990534c3be3c724e
diff --cc drivers/gpu/drm/i915/intel_ddi.c
index c8382f55870c,cec06a5453cc..1488b281b995
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@@ -1165,10 -1235,9 +1235,10 @@@ static void intel_ddi_post_disable(stru
  	if (wait)
  		intel_wait_ddi_buf_idle(dev_priv, port);
  
 -	if (type == INTEL_OUTPUT_EDP) {
 +	if (type == INTEL_OUTPUT_DISPLAYPORT || type == INTEL_OUTPUT_EDP) {
  		struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
- 		ironlake_edp_panel_vdd_on(intel_dp);
+ 
 +		intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
  		ironlake_edp_panel_off(intel_dp);
  	}