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

From: Stephen Rothwell <[email-masked]>
Date: Mon, 8 Sep 2014 14:32:56 +1000

Hi all,

Today's linux-next merge of the drm-intel tree got a conflict in
drivers/gpu/drm/i915/intel_display.c between commit a4bf214ffc72
("drm/i915: Move intel_ddi_set_vc_payload_alloc(false) to
haswell_crtc_disable()") from Linus' tree and commit 575f7ab754c4
("drm/i915: Pass intel_crtc to intel_disable_pipe() and
intel_wait_for_pipe_off()") 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                    [email-masked]

diff --cc drivers/gpu/drm/i915/intel_display.c
index 18da8349a070,b912107a1392..000000000000
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@@ -4168,7 -4253,11 +4264,7 @@@ static void ironlake_crtc_disable(struc
  	if (intel_crtc->config.has_pch_encoder)
  		intel_set_pch_fifo_underrun_reporting(dev, pipe, false);
  
- 	intel_disable_pipe(dev_priv, pipe);
+ 	intel_disable_pipe(intel_crtc);
 -
 -	if (intel_crtc->config.dp_encoder_is_mst)
 -		intel_ddi_set_vc_payload_alloc(crtc, false);
 -
  	ironlake_pfit_disable(intel_crtc);
  
  	for_each_encoder_on_crtc(dev, crtc, encoder)
@@@ -4231,11 -4319,8 +4326,11 @@@ static void haswell_crtc_disable(struc
  
  	if (intel_crtc->config.has_pch_encoder)
  		intel_set_pch_fifo_underrun_reporting(dev, TRANSCODER_A, false);
- 	intel_disable_pipe(dev_priv, pipe);
+ 	intel_disable_pipe(intel_crtc);
  
 +	if (intel_crtc->config.dp_encoder_is_mst)
 +		intel_ddi_set_vc_payload_alloc(crtc, false);
 +
  	intel_ddi_disable_transcoder_func(dev_priv, cpu_transcoder);
  
  	ironlake_pfit_disable(intel_crtc);