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

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

diff --cc drivers/gpu/drm/i915/Makefile
Simple merge

diff --cc drivers/gpu/drm/i915/i915_dma.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem.c
Simple merge

diff --cc drivers/gpu/drm/i915/i915_gem_execbuffer.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_ddi.c
index c8382f55870cc2fbc47bed42886447c052b3630f,cec06a5453cc4a839154dd207edc7d0d699ea099..1488b281b9957a394dd8d6f7230acdd9c145ef52
--- 1/drivers/gpu/drm/i915/intel_ddi.c
--- 2/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);
        }
  

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_dp.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_opregion.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge