linux-next: manual merge of the drm-intel tree with Linus' tree

[Stephen Rothwell]

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_ddi.c between commit 76bb80ed3027
("drm/i915/ddi: set sink to power down mode on dp disable") from Linus'
tree and commit dff392dbd258 ("drm/i915: don't touch the VDD when
disabling the panel") from the drm-intel tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/gpu/drm/i915/intel_ddi.c
index 526c8ded16b0,cec06a5453cc..000000000000
--- a/drivers/gpu/drm/i915/intel_ddi.c
+++ b/drivers/gpu/drm/i915/intel_ddi.c
@@@ -1158,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);
  	}

Attachment: pgp00000.pgp
Description: PGP signature